Merge "Revert "Revert "Print SHA-1 in hex for corrupted blocks""" am: 73cb75b46c
am: 9accc96dd1

Change-Id: I90f0e8dfef1cee02ebb4531560173392d3e5d1fa