move to new vendor config

Change-Id: If1545fbc8efc947f0abd2f8617d4228279b7f9c6