Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count"