DO NOT MERGE - Don't hang installs if the transport disappears

Bug 12991308

Cherry-pick from master.

Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
1 file changed