Merge "DropBoxManager: Allow adding a file using an fd" am: a946cc9f53 am: 71411b877a
am: 8552eb769c  -s ours

Change-Id: Ia73b8d86b9291d9bad2163637832aa387262cc57