[automerger] Fixing crashloop due to ag/2750101 am: a9a1a210d3

Change-Id: Iaf4b026c685b4c5e9705b09a23562c26f3272e98