Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev