Merge "No-op refactoring for TrafficStats APIs" into main