Merge "Remove vts10 from non-SDK test helpers." into main