Merge "Fix failures for V1.0 vts suites on V1.1 service" into pi-dev