Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev