Another fixup attempt for vendor

Change-Id: I2decf288b559a46125c1eec35bdd815c7846bd15