Merge "DO NOT MERGE IP connectivity metrics: fix tests."