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

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