Merge "BatteryStats measured energy for Wifi & Bluetooth" into sc-dev