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

Change-Id: Ia5a88da9a0fb034270bacc91b2079e56faecc100