Merge "Revert "Wifi: Support NVT-ASCII in passphrase"" into sc-dev