Merge "Fix batterystat Counter misreporting when charging" into oc-dev am: 413b135244
am: 95d00a9a25

Change-Id: Ifaa4e1d37c4ad8d841e9224295bb66b000ee0cf2