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

Change-Id: I49845b0bc0183d4d1a6c694a70e30a90a9a59759