Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e33
am: 43581b8759

Change-Id: I67d5dc4b52b254748ff17fe1e16c2eeb1d03c30d