Merge changes I6872d9a1,I5b291fb7

* changes:
  Fix Clang warning -Wbitwise-instead-of-logical.
  Fix Wbitwise-instead-of-logical warnings