Villec2: Vendor hack for nightlies

Change-Id: I302b04ae4e8f6409397358d6af43f7c20de61ee3