Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002"