Merge "ITM Auto-config: Change other_config to ExternalId"