Merge "Fix BLE scan leaks" into oc-dr1-dev
am: 604a4b7171

Change-Id: I9e3f7a0d3b871e5c5e2a740ec69eacaa2cbc41e2