Merge "Add support for WPA for soft Ap"