Merge "Cleanup the mock local service instance after testing done." into rvc-dev am: d2c06f9e am: 8a4ae168 Change-Id: I698af6131d4949801fd6f3e54ee83f7e10cb2463