[automerger skipped] Merge "Fix IUsb version number in vts test" into pie-vts-dev am: 0a55878d1e  -s ours
am: 997fb4631e  -s ours

Change-Id: I2dd4911e27def25111147c4fc7aa3ccd7066c1dc