Merge "PartitionCowCreator accounts for extra extents"