Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev