[automerger skipped] Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b
am: b1498d1d87
am: 89858102c2
-s ours
am: 74b92dc85f
Change-Id: I85b41ec11c18f0b2d98fbc15b1ae4141d23a823c
gugelfrei
commit
8b6ebe4817