am bffbd09f: Merge "Eliminate multiple benign overflow conditions."

* commit 'bffbd09f65d3bc594d844a185d75700e8b4789eb':
  Eliminate multiple benign overflow conditions.