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

Change-Id: If3c708e0ccd5e660c9b0f0a351ce304c0cb7dd61