Merge "Allow --disable-verification when top-level vbmeta is in 'boot'" am: e7180a796c am: 8665bb749f
am: e318d9d5f6

Change-Id: Ia0982306bc1b0a4c1e45d4b56765ea5b41681e63