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

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