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

Change-Id: I81362fcea24b7bf160854c972500f3e63b032330