Merge "Make the udev vs plugdev distinction a bit clearer."