Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 am: 5d44cf6f72 am: 37030d9884
am: 2b55fef6b9

Change-Id: I4110c2cb0273dc3eb617bf10687d4f4781ae98aa