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

Change-Id: I3c35c35934cd6895dcf9dd5eb00542de9fcd9627