Merge "Merge "Fix misc-macro-parentheses warnings." am: 945da9bbcd am: b3db6b8c3e" into nyc-dev-plus-aosp