Merge "Add EXTRA_PERMISSION_GROUP_NAME"