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

Change-Id: I4c95500cddf7659b13ada0ad70584aef190ced7f