Merge "Migrate PermissionGrantTest." into sc-v2-dev