Merge "Code formatting change for upcoming annotations." am: 5d669f79f2
am: 5d44cf6f72

Change-Id: I535f393a19acb88331d17fd1c6d18aa3ef799180