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