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

* commit '0ba3db9e91d683a75af244cccfa62c8778a4c62a':
  Eliminate multiple benign overflow conditions.