am 2f37f9af: Merge "Interleave br/edr device discovery with BLE device scan...
am 2f37f9af: Merge "Interleave br/edr device discovery with BLE device scan for some targets" into klp-dev
* commit '2f37f9af':
Interleave br/edr device discovery with BLE device scan for some targets