Sync devtools and fix rubocop warnings