Merge "Code reformatting for upcoming automated code changes." am: 3b2cd9244d am: 0c875607f0
am: 6b9e65bea3

Change-Id: I5ca0de51793f574d7dc54b16e5427673bc5950f9