Add host support am: aab07a44fd
am: 3ec7d07ac6

Change-Id: I7d8fc1bdf4d36af413164dadf209c8784bf0d9da