Merge "Handle failed usb/reads and writes correctly" am: 6e28863442
am: fc5c5f2b27

Change-Id: Iebedde2d9306de5a9a99b548fc4e24a95f8ff08e