Merge "Apply suggested edits to the file-download API"