Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e
am: 7ea8c51311

Change-Id: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
tree: 262c8be07da4ff8050b78124b2533b7edd412d4e
  1. core/
  2. services/
  3. tests/