Merge "Merge "Fix BLE scan leaks" into oc-dr1-dev am: 604a4b7171 am: b7e2c50214" into oc-mr1-dev-plus-aosp
am: 7590ede16d

Change-Id: I40885dd3dfed1331393e85a821e23aea3925ab07