Merge "Fix BLE scan leaks" into oc-mr1-dev am: 9beb5e4526
am: ffbf28e5c5

Change-Id: I0cd543a31a84cb0ff2971cda06481ff35a5e6459