Merge "Remove BatteryStats testWifiScan" into pi-dev