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

Change-Id: I60cde4ee33466b8843c34362f9a792c4d2948353