Merge "Remove override of 'expected_error_codes' with defaults"