Merge "Revert "Fix VTS Fuzz issue""