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

Change-Id: I1a85540ce536a594882a12cef03027f9e48e71fa