Merge "Update carrier configs for DataConfigManager"