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

Change-Id: I3b55e5cac6168719dc586013707c8d270b148206