Merge "[vts] Fix VTS batched-command tests" into main