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

Change-Id: I4c10058445c1252447f2cd5889bb35f425efa468