Hygiene: coding style spacing

Change-Id: I312e9758f4d588d7883d7dc0aef3928ed2e64448
Merge "Hygiene: coding style spacing"