[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53
am: 08bd47e9a9
am: 279cc3d65e
am: 972b5551f6
skipped: ded6cb5910
am: 0d2edbd6ab
am: b078fd6b8c
Change-Id: I163ea50aca6838abcf0c58e042a5fe386f661afe
gugelfrei
commit
6460a0149b