Merge "Revert "Use addEntries when creating NetworkStats"" into main