Merge "Update ContentInfo.partition to return a Pair instead of a Map"