[automerger skipped] Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" am: a1e93d0a66 -s ours
am: ac828b9ad4 -s ours
am skip reason: subject contains skip directive
Change-Id: I3c3a25cd81aaff1a4d5ac7e5d4db9a03ea8f9d84
This commit is contained in: