Merge "Deprecate BSSID Hostlist system API" into oc-dev