Merge "API review : use a range of numbers for OEM errors" into sc-dev