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

Change-Id: I68ddd18a4fe2858fe7558b203c774b5b235b1303