Merge "Add annotations and finals to PermissionGroupInfo"