Merge changes I8b85d8ee,I789f41f1

* changes:
  Parse proto tombstones.
  Extract tombstone tracking to a separate service.