Modular vendor

Change-Id: Iee0eb79c0c554a7a91173f342cbdc5db44217b22