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

* commit '29cc033c02a995e1d02a353627dfe93231239352':

Change-Id: I522ceb065a10359d8ceb59fe1a76c24405d5ca96