Merge "Fix duplicated SettingsEnums.TRUSTED_CREDENTIALS"