Merge "Fix BLE scan leaks" into oc-mr1-dev
am: 9beb5e4526

Change-Id: I92a689f0320d195730185d412b2070b4e5a2b620