Merge "Fix mobile data usage didn't get increased for xlat464 traffic" am: e284b30c81
am: e74fb60c29

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