Merge "add host unit tests" am: 613f0dfb7e am: 9736842836
am: f6a4a2a23b

Change-Id: I1cf892afdeb8a1680a50965f13230afbc73f92ca