Merge "Enable vfc-ztevnfmdriver sonar scan"