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

Change-Id: Icf8f7ec6d0a9a74fdad5c7b49c88a5ef71dedd3c