Merge "Address review followup comments for NetworkStats" into main