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

Change-Id: I38d7b714bd74850a5ffc7c0c26af76dcfd8fb417