Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd
am: 3934c475ce

Change-Id: Id1a1e80269263ecf10d80795cea64f16aa1f6058