Merge "Fix style errors in NetworkStats"