Merge "Misc style updates to fix some GAR issues" into pi-dev am: 2200308554
am: 7a6a3b28a9

Change-Id: Ia249bbcced52acb9b0316f218472f53ef3868993