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

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