Merge "hal: Fix VTS errors"