Merge "Fix division-by-zero when reading partition tables"