Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1
am: 7d345f27e7

Change-Id: I9ae05b6590af22e98c7cd31a480b4e4c73b67226