Merge "NetworkStats: more robust subtraction for deltas" am: be1e405cc7  -s ours am: 856ebe37eb  -s ours
am: 5509ba6d40  -s ours

Change-Id: Ib7cf5b4eb2cc858d93e2d3e49b9325495a47667e