Merge "Fix other tests be affected by mocked local services." into rvc-dev