[automerger skipped] Merge "Fix mobile data usage didn't get increased for...

[automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev am: 2c74b2e5 -s ours am: a708c799 -s ours
am: b2a950f2 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 feb79bd0 is in history

Change-Id: I87c4f2a4d66b6f190c95a28219a75d290cb3cfd0