Merge "Revert "Revert "Change condition to opposite if lhs is constant"""
am: 45ec0967f1

* commit '45ec0967f1ac09d223e94267c0004dc08670792e':
  Revert "Revert "Change condition to opposite if lhs is constant""