Merge "Ensure dropbox could copy tombstone files to special folder."
am: 12cdea59d3

Change-Id: I8b7f1b2d07629af4cc0008679cd8daf7d1e0464f