Merge 3.5-rc3 into usb-next