Merge "Code reformatting for upcoming annotations." am: 60c8cfdd0f am: 02763a1c3e
am: 842e882507

Change-Id: If4c2746b23ca5bdef08635e78b3aca914bb9e52f