Merge "Fix other tests be affected by mocked local services." into rvc-dev am:...
Merge "Fix other tests be affected by mocked local services." into rvc-dev am: d1979ef0 am: 1600e0bf am: efafcf5c am: b4a31eb8
Change-Id: Ieee1af8e06f839a067444614e1ed297032d13d33