Merge "Update api for ServiceStateProvider"