Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" into oc-dev
am: 6d46bc2ed3  -s ours

Change-Id: I719cc01343397345afd5fee9322e588b1b8336b3