Merge "Continue fixing [UnnecessaryParentheses]"