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

Change-Id: Iffd38fbc5ee5cd01d5900afbfee331e005b860c6