Merge "Fix VTS Fuzz issue"