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

Change-Id: Ibdb6876083588ad5c741fe8d45d46d119fd713fd