Merge "Add method to calculate last full charge time" into oc-dev am: d4991dc24d
am: 42790ccd84  -s ours

Change-Id: I09c4fdc402133470177817ca4fd713c372be2015