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

Change-Id: I4e8f9adde429507c9136a4bf25ecfc1a7299ad6d