[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e

Change-Id: If379e03d3998c1267bc66f53b308ea28bcd4c128