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

Change-Id: Ie536c5dd8c447cd3753725040edbec7ce478ea07