More vendors

Change-Id: Id1d1f5823361a51307549432ada9a0dc45022ea3