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

Change-Id: If50b9304e64a5d4c18c78d933c121d428d660d61
tree: 0fb4825f55bbd6dd15f347e49294243aa1d11f0a
  1. core/
  2. services/
  3. wifi/