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

Change-Id: I878947630e3cec949dbfa361a379637a30d67a1d