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