Provide "None" as a possible choice for attachment download

Bug: 745971
Change-Id: I5d2431782c9d161e1d551af4cb3c8df4e92d5925
Merge "Provide "None" as a possible choice for attachment download" into develop