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

Change-Id: I176ced76dd8fac0ecc1e0add8c9c572cddaf56a3