Merge "Dumpstate: Add tombstone filtering" into oc-mr1-dev am: 4d8a26a9e6
am: dfd4ea3d9b  -s ours

Change-Id: I9795452a6c2bab58021db7683c59b73f1f29c4d8