Merge "API: Validate API error codes"