Merge "Fix metadata location when file system doesn't span the partition"