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