Merge "DropboxManager: Add err message if passing an invalid fd to addFile()" am: 90529d212a
am: 13d6ac4a35

Change-Id: I2ef468422d41228ce5b10028b4f8da4e3c5d23ce