Merge "libsnapshot: Refactor CreateLogicalAndSnapshotPartitions" am: dccd6b3389
am: 362853af1a

Change-Id: I5c667679545459aaa21c6163487881fd11900148