am 3d71b0c7: Merge "Add new vendors" into jb-mr1-dev

* commit '3d71b0c7e2c28008ba9658df0138008d66bd5d4a':
  Add new vendors