Merge "BpfNetworkStats - remove spurious code & use static maps"