Merge "Add crash_dump and tombstoned products." am: 6651199eeb am: 7cf55a4581
am: 1df77bc0c7

Change-Id: I298e81531aa44a488ba1ff1e73148de83830fd9a