Merge "Revert "Print SHA-1 in hex for corrupted blocks"" am: 06f6227f1d
am: 8acce85be8

Change-Id: Idfa1fa66a81fa8282737258bc846cce0a4919b4a