am 0469d2c3: Merge change 2282 into donut

Merge commit '0469d2c37adddcb30cb0d88772bef33ac26c6500'

* commit '0469d2c37adddcb30cb0d88772bef33ac26c6500':
  Support for 3rd party USB Vendor IDs in adb.