Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c am: 15364530 am: 00956c4f am: 729c31c2 Change-Id: I8f1d172a3514e4fb9230af9e09aeaf638f03091c