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

Change-Id: I78a510725a199b5056ede41492e07b45dce022f5