Merge "Add method to calculate last full charge time" into oc-dev