am 45664c99: Merge "Avoid signed integer overflow."

* commit '45664c995b99e81f6d425206d7a43cb3b898daab':
  Avoid signed integer overflow.