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

Change-Id: I22b4da6b09985d99de20f6fe4602441d49c40993