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

Change-Id: I54ff5a6a0ccc29a2e4acb9983c0610f18c9f7950