Merge changes Ibc9ada6f,I2c5fce16

* changes:
  Power model calculation based on batterystats data.
  Parse the raw batterystats into an ActivityReport object.