Hygiene: Code styling fixes

Change-Id: I67e46bc0a90026754a79cd96ada70d440d4b4e17
Merge "Hygiene: Code styling fixes"