Merge "tombstoned: don't create tombstones for failed dumps."
am: 294d41cb83

Change-Id: Ia94317bd46773d6199853ded19ea804abbaf68c9