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

Change-Id: Iabe1dfafc8a81e1be48ead57a07565f89197ece9