Merge "Fix vfc-ztevnfmdirver affectedvl data"