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

Change-Id: I29dfc33428415649a0dae8587423c41182f3e7e5