Merge "Fix to conform Google's coding convention" into nextgenv2