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

* commit '38c4d87d196600b0d3e13350f23326763a9ae19a':
  Mul simplification should expect zero operand