Merge "IP connectivity metrics: cleanup obsolete code"