Merge "Fix vfc-ztevnfmdriver csit failure"