am a2d8b187: Merge "Fix a bug in DeadPhiHandling around conflicting phis."

* commit 'a2d8b187e7b6631692fa1243e86ef16c428fa9da':
  Fix a bug in DeadPhiHandling around conflicting phis.