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

Change-Id: Id046871cf4b42b33dc2723c0ae294fe9706891f7