am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev

* commit 'bd9513f3b27a9a15a12474ff5b270abd69a013a1':
  Add HSPA+ to BatteryStats