move to new vendor config

Change-Id: I3d954bb4886e510edc4efbb1ef352931420c8489