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: 11281b10 am: d36ffc05
Change-Id: Ia80722326ac10d471ef20a2c9246b66d076e7128