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

Change-Id: I3e77fc382a76eee6bf95e9cdd7f2f7da20fbdb5a