[automerger skipped] Merge "DO NOT MERGE: use legacy way to get tcp packet count" into pi-dev am: 15cbfefb03
am: 279b414175  -s ours

Change-Id: Ic8146ca44a5731d2ec1d7658274e5353434da908
tree: 0a5dd49a838abab677bcb4fd1cd6b6aaf5c2eed0
  1. core/
  2. services/
  3. wifi/