Fix non conforming partition table#2668

chewi merged 2 commits intomainflatcar/scripts:mainfrom

disable-hybrid-flagflatcar/scripts:disable-hybrid-flagCopy head branch name to clipboard