Merge "Continue fixing [UnnecessaryParentheses]" am: 748515ea07

Change-Id: I996e0393c6620d65a10f1ae9d5e2871caa88f613