Merge "avoid 32-bit integer overflow" into oc-dev am: 88b32e4b7f am: f6b45069bb
am: b3399c1c47

Change-Id: Iaf12457999b88f81b21a8964f87660adf91437b1