Merge "Fix integer overflows" into nyc-dev
am: 65f611a0e9

* commit '65f611a0e99133244f77c853495083733444b231':
  Fix integer overflows

Change-Id: I3f5b4ed769aab0e61b47e2f2849edba4dee0a4b6