am 38ea3827: Merge change 2122 into donut

Merge commit '38ea38278923db2823f159df7d53e7964466bc2e'

* commit '38ea38278923db2823f159df7d53e7964466bc2e':
  Add support for USB Vendor ID in the add-ons.