Merge "Last-ditch clamping of negative NetworkStats." into pi-dev