Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev