Coding standards cleanup

Change-Id: Id2c191c6e7eeeb0063048c4e972499e2ab528d01
Merge "Coding standards cleanup"