move to new vendor config

Change-Id: I117167d38f0b35ec163ba77ee07702ebf6053e54