Merge "Code reformatting for upcoming annotations."