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

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