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

Change-Id: I72db65a3639b79d603868c3068d82b4ce5220ea8