Merge "ApiFormatBase: Encode filenames in Content-Disposition"