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

Change-Id: I4bc238734a607d651fed4255b9af129c0faf1e3c