Merge "Fix mobile data usage didn't get increased for xlat464 traffic"