move to new vendor config

Change-Id: I57a8a37ab73bf49682a772b0ce83d2ff17114948