Merge "[MS75] Replace TrafficStats data units with DataUnit class"