Fix a few host-side test failure due to incorrect service name. am: 8aac1fce63
am: f3cc2e40a4

Change-Id: Ib9b2e0104f7d3edf2e4bc04e3d50d2c9ebb647b7