Merge "check ext4 magic before running next steps" am: 82bd278dc4
am: 9183d0701d

Change-Id: I0ef0cfe69695dce01398cd6fe7a469d4ddbbba4e