Merge "Hide ContentInfo.partition from the public API"