Merge "Remove outdated Rubocop offenses from .rubocop_todo.yml"