Merge "Batterystats BLE results counter takes in count" into oc-dev