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

Change-Id: Ia169a9fc152f100a9567f2c47ef5a2e46358aa52