Merge "Fix a bug in DeadPhiHandling around conflicting phis."