Merge "Wait for network to resume in ConcurrencyTest"