Merge "tombstoned: Rename proto tombstone before text tombstone." into main