Merge "Fix other tests be affected by mocked local services." into rvc-dev am: d1979ef0 am: 46c3b395 am: 4d92eda6 Change-Id: Ia17df0398ab828fb81f9ddeaaac5f43e179ca579