Merge "[Test] Fix DNS resolver MTS failures" into main