Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" into oc-dev