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