Merge \\"Fix misc-macro-parentheses warnings in Gallery2.\\" am: 67d7daa7b3
am: 794861c20c

Change-Id: I2e57f02e021a0b5483b948d4f4294784a5cee72d