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

Change-Id: I14e8837ac6069696b55a5344e667c2be00385d9b