move to new vendor config

Change-Id: Ie7b67bc650d6030ae75f5d4e5843430603eebcc6