Merge "Add HSPA+ to BatteryStats" into klp-dev