Merge "Creating logical and snapshot partitions uses timeout in tests" am: 274bd807a6

Change-Id: I374a5f77c951db18a8daa50104f39471f8a2b25d