Merge "Rename BlockRestriction -> BlockRestrictionStore and wire it up as a service"