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

* commit '68bd94e288985af0de983950e6fb98bfea62f19f':
  Add new vendors