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

Change-Id: I10bb6b6b1d16662bbc75ac6f7494f4622dd19e35