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

Change-Id: I4066f56a63322b6cf60d61927739f07846fd9e37