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

Change-Id: I65e4990a08cc59ce30ee6d987f13a0381b42e58f