Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev