Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev