Merge "BatteryStats: Fix issue where network traffic accounting might be lost" into nyc-dev