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

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