am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data...
am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit 'c96e6f19':
BatteryStats: Use proper power calculator when energy data is received