am 0b5830e8: am 374ad789: Merge change 24577 into eclair

Merge commit '0b5830e8f1d8b18afa238e5c3ac154c326bd4fb1'

* commit '0b5830e8f1d8b18afa238e5c3ac154c326bd4fb1':
  Update peephole optimizer