Merge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 3e832cf58e" into oc-dr1-dev-plus-aosp