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

Change-Id: Ia3ed8b5a46ec3be2a718af8e31a0ef6af64ab541