Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2
am: 253e223799  -s ours

Change-Id: Ie57f78309f2937f2d1212f0eadf72418cf43195d