Merge "libsnapshot: Refactor CreateLogicalAndSnapshotPartitions"