Merge changes I824c99fa,I1ce03549

* changes:
  Usb: Remove unused interface methods and constants
  Usb: Fix incorrect mapping of port mode constants