Merge "Merge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 3e832cf58e" into oc-dr1-dev-plus-aosp am: 411e110abb" into oc-mr1-dev-plus-aosp
am: aa50022b57

Change-Id: I5b79eef5570666866f1ecf56dd16942f9928b5cd