Merge "Added AKMs in convertLegacyFieldsToSecurityParamsIfNeeded" into udc-dev