Merge "Update extra_headers param docstring"