[automerger skipped]Merge "Fix crash on hotplug disconnect" am: e4a97f23c2
am: 8835aeae4b  -s ours

Change-Id: I64fff837b9b0c12958b355d18c93b4c1e4523dd0