Merge "Fix BLE scan leaks" into oc-dr1-dev am: 604a4b7171
am: b7e2c50214

Change-Id: I967febb18b966e8d2581569608b9fd228b1b7e82