Merge "Fix TLD issues for test concurrency"