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

Change-Id: Id462f492b9a7882c700d090dcfe5eb366f44556f