Merge "Set security type to PSK for FT/PSK AKM" into udc-dev