auto_hotplug: sync changes with my hammerhead