Merge "Fix cpplint whitespace/operators issues"