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