Merge "dumpstate: remove the arbitrary limit on tombstones." am: e98cb32bba
am: 74de98b492

Change-Id: If4d25c089f76353de1fef39de91e5094016f123a