Merge "IpManagerTest: fix flaky test for real"