Merge "Creating logical and snapshot partitions uses timeout in tests"