Merge "Improve how battery stats collects network stats."