Merge "Update api for ServiceStateProvider" into oc-dev