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

Change-Id: I05ad553e9cc234a181df8597a835611820527939