Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev