Merge "Fix crash on hotplug disconnect"
am: e4a97f23c2

Change-Id: Id4e07f31f399bfb6f236155435fbcfe6464c5b49