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

Change-Id: I14996b3e998e918c75223ed4716c35d9f0a436ec