Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b
am: b1498d1d87

Change-Id: Ic7ef94c42d54d4f29c92bad98001bd6e065f5013