handleVendorVariant() strip in case some was injected

Change-Id: I73c42a99671524e9fb186257a9bc943d514958c2