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

Change-Id: Iee85eaf19a47abde76019c3b558bb6caa3f30544