Merge "crash_dump: properly dump when we can't talk to tombstoned." am: fc12c4b81e
am: deec0278ab

Change-Id: I39627c0ddd30bad2019fd8b31a3a3472a23efaa8