Merge branch 'usb-prereq' into dt-test