Merge "Use StopServicesSetup to stop/start framework." into rvc-dev