Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e am: 1536453059 am: 00956c4f7c
am: 729c31c2e9

Change-Id: I8f1d172a3514e4fb9230af9e09aeaf638f03091c