Rest of changes for group annotations.

Change-Id: I467c40e4db11c5a7ed6fe259a6b68df727a55b9a