[automerger skipped] Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" am: 46197bb418 -s ours
am: 465a03d499 -s ours
am skip reason: subject contains skip directive

Change-Id: I3c3a25cd81aaff1a4d5ac7e5d4db9a03ea8f9d84