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

* commit 'ed54f6a95bc81e4e8f987e3955731d00c297c480':
  Avoid signed integer overflow.