Merge "Wifi: Fix VTS test backward compatibility"