Merge "Cleanup the mock local service instance after testing done." into rvc-dev