Merge "Minor cleanups to NetworkStats interface tracking." am: 6455e31b76
am: 9d04a8c92d

Change-Id: Ifa76adb79440b1d97c6cfc637509c0ddaefa76fa
tree: 4f9722e33d29f1cd4bdafb931c886986c509a279
  1. core/
  2. services/
  3. tests/