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

Change-Id: Iff1a6f84a173ec61780e7e7ceee1e35b28ca3935