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

Change-Id: I377cba24b9723397499a1077df22ff018031344f