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

Change-Id: I86405e95cdaa17ab3184d472db0022c51d2c1ec5