Merge "Remove dead non-proto tombstone reporting code."