Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev