Merge "Cleanup ServiceState.toString()" into oc-mr1-dev