Initial implementation of group annotations.

Change-Id: Id343af6a6279cb52d94ab5968df9e2d28a79468c