Merge "Use TRANSPORT_USB from the SDK"