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

Change-Id: I2378d352d1b545eaab8c27698d934b5fcf50829e