Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks"