Merge "NativeTombstoneManager: track proto change."