Merge "Update permissions for ServiceState broadcast" into sc-dev