Merge "Revert "Reduce CPU cycle on calling  TrafficStats for Rx and Tx bytes"" into tm-dev