Improvements to host-side tools
am: d8b0d16fe5

Change-Id: I22b4b9fe636aab58ef6c70f02c7d6323fe2634cc