diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java
index 2d1574b7ea..0a75bfc233 100644
--- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java
+++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java
@@ -434,7 +434,7 @@ public class CmdLineParser {
     }
 
     private void parseAdditionalOptions(String prefix, Object bean, Set<Object> parsedBeans) {
-      for (Class c = bean.getClass(); c != null; c = c.getSuperclass()) {
+      for (Class<?> c = bean.getClass(); c != null; c = c.getSuperclass()) {
         for (Field f : c.getDeclaredFields()) {
           if (f.isAnnotationPresent(Options.class)) {
             Object additionalBean = null;