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

Change-Id: I84aad4b9815196e0362d6adba34359a260853f46
tree: 1ab7c033460457457dfc88f921c20e1213d6eba4
  1. core/
  2. services/
  3. tests/