[automerger skipped] [automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e am: 972b5551f6 skipped: ded6cb5910 am: 0d2edbd6ab am: b078fd6b8c am: 6460a0149b  -s ours am: a815fe5d4c
am: 74c3059924  -s ours

Change-Id: I1edfdbc1b6304a40bfbdcdf5c5aa8f0051241448