am c6a6c6de: am ad2a1592: Merge "Enable multiple benign overflow conditions."

* commit 'c6a6c6de7c43198dc93f92f935ebc120de1050c8':
  Enable multiple benign overflow conditions.