Merge "Skipping CompareVBMeta() in VerifyVBMetaDataError test case"