[automerger skipped] Merge "Fix network usage stats on 464xlat tethered." into pi-dev
am: e4bcfd8889  -s ours

Change-Id: I49845b0bc0183d4d1a6c694a70e30a90a9a59759
tree: 3eeee347f10afe73a9fb08040d2ddab28e5d202e
  1. core/
  2. services/
  3. tests/