Merge "Fix flaky IpPrefixTest."