Merge "Use addEntries when creating NetworkStats" into main