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

* commit '65f611a0e99133244f77c853495083733444b231':
  Fix integer overflows

Change-Id: Id316a623262481d30e5e05215d8930ff8f103d27