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

Change-Id: I4a9a99c72f8a1d70355d1bf910530ca50cab8a77