Merge "Rename usb test according to vts convention."