Merge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 1199972de1 am: e9f727dd75" into oc-mr1-dev-plus-aosp