moveto new vendor config

Change-Id: I6a6f5b16d0266f5ec3c2c05fea68b3af934b2d68