Improvements to host-side tools am: d8b0d16fe5
am: 3c8d676c7f

Change-Id: I1ab0f5981087683907231b3d3962674c4489c3a1