Merge "IP connectivity metrics: fix tests after proto update"