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

Change-Id: I447e0ce278b5eadf593d0bc464d866fa02bb3a6d