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