Merge "Windows USB Driver for generic + Q, rev 7."