Merge 4.8-rc5 into usb-testing