Update formatting

Should silence most CodeSniffer checks.

Change-Id: Iec54becdb55731fe44bb9caa8f27f55766d1e1ad
Merge "Update formatting"