Merge "Revert "Pivot network statistics to use DataInput/Output.""