Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e" into oc-mr1-dev am: 279c26fa Change-Id: Id85a409a2d3cc12e53f977f94f7b5a306115a09a