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

Change-Id: I6ac730098d8c1a0c46741f559416253305921819