Merge "Stabilizing tests for TopologyManager."