Merge "Remove the usage of deprecated arg 'expected_error_code'"