Merge "Integrate integer overflow changes from security branch" into nyc-dev
am: 67bc1e7750  -s ours

* commit '67bc1e775074b78ad6b55489ee613ef9666a04fd':
  Integrate integer overflow changes from security branch