Merge "Reboot and retry on I/O errors" into nyc-dev am: d345de66ef  -s ours
am: 3f004e03e5

* commit '3f004e03e59f7efc8c2ea0a6ec682ca0054c5c0b':
  Reboot and retry on I/O errors