Merge "move ACTION_SERVICE_STATE to system api" into oc-dev