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

Change-Id: Ic0c27635bc63b0cfdf437fc819b52b9cb2d5244e