Merge "Update api for ServiceStateProvider" into oc-dev
am: 728fbfb7c1

Change-Id: I0b61681780b9337b5b6e36b1aadc23c52199ea08