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

Change-Id: Ied69a536dedf1f4a2d64af1d0680c0706435a994