Merge "Revert "Add host support"" am: c51853325c am: 5587e0bde3
am: 556e7ad636

Change-Id: I7490b8ffdf2c80e3138e457de6f0fc3191d36cfc