Merge "Handle failed usb/reads and writes correctly"