Merge "Fix batterystat Counter misreporting when charging" into oc-dev