Merge "Code reformatting for upcoming automated code changes." am: fc38791616
am: b4a4f7e366

Change-Id: I20eff2644e434683441593b4ec173773c2d0e34f