Merge "Fix IUsb version number in vts test" am: a85e213544
am: bf03ebe580

Change-Id: I18b61c687380064ac584804ca806e3b59db94593