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

Change-Id: Iffb58ee0b43552e8c60396872174377c2d1ed4f0