Merge "IP connectivity metrics: add new APF counters."