Merge "Code reformatting for upcoming automated code changes."
am: 661facc2f1

Change-Id: Ie2c10b5d6afadec937400f651aecc08a9aa494df