Merge "check ext4 magic before running next steps" into oc-dev am: 421067e040
am: 662ef6f866

Change-Id: I96dd8718267b3df703ff5c532725b8ab7ddd9c5a