Merge "Notify the caller about I/O error"
am: 2f206c6270

Change-Id: I59b43aa3c092ee577833da5dc110953d4b21154d