Merge branch 'net-adopt-u64_stats_t-type'