[automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev am: 2c74b2e5d8 -s ours am: bc91f6051d -s ours
am: 3f2db5da60 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 71dd51cefd is in history

Change-Id: Ia244b8a8529dbb267ff28a76c643e283d3feab26