Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev