Merge "DO NOT MERGE: use legacy way to get tcp packet count" into pi-dev