Merge "Print SHA-1 in hex for corrupted blocks" am: 59383b383c
am: 821592aff4

Change-Id: I7555a81c640bee3c8bb165fe712d5d55cb94d6fe