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

Change-Id: I4edafeb10fcb2dabffe2b139893ae18139930656