Fix coding conventions violations

Change-Id: I6ec0849b4196899c1f74b67173b17b4e2c58cba6
Merge "Fix coding conventions violations"