[automerger skipped] Merge "tombstoned: don't create tombstones for failed dumps." into pi-dev
am: 65c2b8d2d2  -s ours

Change-Id: I20b4204f66d164fa030318f386a8c9b06a72c811