Merge "Fix BLE scan leaks" into oc-dev
am: 6e749c392b

Change-Id: Id43b33865e287ec19a2ae4c56815d12bb402ab09