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

Change-Id: I7285e25ca98306dac732768df556e6371591ed27