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

Change-Id: I8e019cb7e9bff94970082b3a3329ff0b33c37135