[automerger skipped] Merge "Fix IUsb version number in vts test" into pi-dev
am: 03f16e442a  -s ours

Change-Id: I894de42e820eded93c289888e492692429b986f8