Merge "Wean Statsd off BatteryStats: Network Power"