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

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