Merge "Use new NetworkStats#addEntries API" into main