[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 skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 feb79bd0 is in history
Change-Id: Ia76c06513e23c4052262c8ac4c7212a548267a8c