Merge "Remove vfc-ztevnfmdriver unused code"