Merge "Send ble scan type to Batterystats" into oc-dev