Merge "Fix IP connectivity metrics tests"