Merge 4.8-rc6 into usb-next