Merge "Fix bugprone-macro-parentheses warnings" am: 608c74aecf

Change-Id: Ie9fee69253e70ad129eadd2d8d78d8beb1498918