[automerger skipped] Merge "DO NOT MERGE: use legacy way to get tcp packet...
[automerger skipped] Merge "DO NOT MERGE: use legacy way to get tcp packet count" into pi-dev am: 15cbfefb
am: 53fa21f5 -s ours
Change-Id: Ic8146ca44a5731d2ec1d7658274e5353434da908