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

Change-Id: If787779260cf5b3fbd7d5e5fa72ae5b9067b31ee