Merge "hal: Fix VTS failures"