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

Change-Id: I40650830f287b73e7ff40be31b7a6f9f6f69e501