Merge "Windows USB Driver for generic, rev 7"