Merge "Ensure CallId is not null when connection creation is complete."