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

Change-Id: I5ffd6db003ecfe7bbdeeaeda761eaa128290c46e