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

Change-Id: I67465690c2addbbfbe53472e5b45783821990567