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

Change-Id: I305f6f30a2f5f4ddb483131a5ef48cf501fb2b74