Merge "DO NOT MERGE: use legacy way to get tcp packet count" into pi-dev
am: 15cbfefb03

Change-Id: I7d0498bece672a482e2204424ca5d7780a6c7dc8
tree: a4f437434671969d9b722a04c12c9fd3d08d3527
  1. core/
  2. services/
  3. wifi/