am f1301a57: am 84c5f998: Merge "Mul simplification should expect zero operand"

* commit 'f1301a579cceb89f737f71c8d8d5a5db9b6f58d3':
  Mul simplification should expect zero operand