Merge "DropboxManager: Add err message if passing an invalid fd to addFile()" am: 90529d21 am: 13d6ac4a am: 72b12e42 Change-Id: Icfe984f46cb6e6cdc216d7182285c7e55abe93ab