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

Change-Id: I505676fe1a12f21cf9b006d1d417410616ba5053