Merge change 2282 into donut

* changes:
  Support for 3rd party USB Vendor IDs in adb.