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

* commit '84c5f9986dfaab881d4c66b2f3cb214e6152e9f7':
  Mul simplification should expect zero operand