Merge "Adding sanity check for VBMeta device state"
am: 63cc8d12a5

Change-Id: Ic642331cf6f3d0ad04bcaea691f860bd182d3059