Merge "Merge "Code formatting change for upcoming annotations." am: 5d669f79 am: 5d44cf6f am: 37030d98 am: 2b55fef6"