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

Change-Id: I3f519182d9a8d90a2e426de63480e2ed399502ae