[automerger] Fix possible out of bounds read am: 3762e06152 am: ecc92a1a86 am: 1c7bb87a42 am: 4cdd5c3af5 am: bad0533d2e am: 19d1113bb0

Change-Id: Ief894a707f37e18052c5deb54500aa499f69340c