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

Change-Id: I98e37f994cf08f92cada289f64dda9530c64b4f3