Merge proposals dependent on lp://qastaging/~bladernr/checkbox/796604-fix-usb_detect

lp://qastaging/~bladernr/checkbox/796604-fix-usb_detect has no merge proposals.