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

Change-Id: If8c252038d86ffb9d60de27d50994a2ebcca8408