Merge "Allow --disable-verification when top-level vbmeta is in 'boot'"