Merge "Code reformatting for upcoming automated code changes." am: 43f3f60ec0 am: d9b640cbc2
am: 17ea268961

Change-Id: Ia86c739b9e02e963f3c74b25d67b7663860518bd