Merge "Code reformatting for upcoming automated code changes." am: 661facc2f1 am: aca9678a86
am: dc236d5fce

Change-Id: Ic4fef82d5c6018e55143e0a570e32ec930a6c072