Merge "snapshot/test: Add delay to all the CreateLogicalAndSnapshotPartitions" am: b34a729469 am: 5f1a3a9a3f

Change-Id: I9c74970beb1e70b28b9bae77c1ec8508b86043ed