Merge "bpf network stats - move double accounting tag!=0 out of bpf"