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

Change-Id: I094ac59296a118fbacc70b4ead1230b4d8683fa2