Merge "Add a generic error message for missing vendor error strings." into sc-dev