Merge "Adding sanity check for VBMeta device state"