am 83b31aae: (-s ours) am d5b25cbd: am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev

* commit '83b31aae81402c2b10bd711bc14c6ebdfe4c85bf':
  DO NOT MERGE - Don't hang installs if the transport disappears