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

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