am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev

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