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

Change-Id: Idc4ce525b14a29f6ed87850f6df9577bdd05f38e