am 84c6ef89: Merge change 8516 into donut

Merge commit '84c6ef89468a8753dfb4b87f203c800c199c7bd0'

* commit '84c6ef89468a8753dfb4b87f203c800c199c7bd0':
  Refactor API classes to support both, WinUsb and Legacy API