Merge "Fix -Wbitwise-instead-of-logical"