Merge "Don't clear restart counter when bringing up the service." into oc-dev