Merge "Add WPA support for soft Ap"