am dbf8b6ff: am f456ce1d: Merge "Remove warning when we do too many simplifications"

* commit 'dbf8b6ff35d67069332a9768800b8a5497c8f3bb':
  Remove warning when we do too many simplifications