Merge "Code formatting change for upcoming annotations."