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

Change-Id: I365d8b49ce7dbf99eeba99916452808ca102fa88