Merge "Batterystats BLE results counter takes in count" into oc-dev am: 80fc1af120
am: 78ae8e0436

Change-Id: Ia618e177af4d1e6f33c901be91a7109dc7615850