diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/NnOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/NnOps.java
index 9859a308562..535af3cda71 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/NnOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/NnOps.java
@@ -3126,7 +3126,7 @@ public <T extends TNumber> SparseSoftmaxCrossEntropyWithLogits<T> sparseSoftmaxC
    * @return a new instance of TopK, with default output types
    */
   public <T extends TNumber> TopK<T, TInt32> topK(Operand<T> input, Operand<? extends TNumber> k,
-      TopK.Options[] options) {
+      TopK.Options... options) {
     return TopK.create(scope, input, k, options);
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java
index 189f0434054..5185b5fd785 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java
@@ -118,7 +118,7 @@ public static <T extends TNumber, V extends TNumber> TopK<T, V> create(Scope sco
       describeByClass = true
   )
   public static <T extends TNumber> TopK<T, TInt32> create(Scope scope, Operand<T> input,
-      Operand<? extends TNumber> k, Options[] options) {
+      Operand<? extends TNumber> k, Options... options) {
     return create(scope, input, k, TInt32.class, options);
   }
 
diff --git a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/ClassGenerator.java b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/ClassGenerator.java
index 78b8ea04964..1777bd141fb 100644
--- a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/ClassGenerator.java
+++ b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/ClassGenerator.java
@@ -105,7 +105,7 @@ enum RenderMode {
 
   /**
    * The generated options class, or null if it doesn't have one or {@link #buildOptionsClass()} has
-   * not been ran.
+   * not been run.
    */
   private TypeSpec optionsClass = null;
 
@@ -748,6 +748,10 @@ private void buildSecondaryFactory(
         body.add("$T.class", defaultTypes.get(attr));
       } else {
         factoryBuilder.addParameter(param);
+          // Checking if the parameter being added is the variadic options or not
+          if (param.name.equals("options")) {
+              factoryBuilder.varargs();
+          }
         factoryBuilder.addJavadoc("\n@param $L $L", param.name, paramTags.get(param.name));
         typeVars.addAll(new ResolvedType(param.type).findGenerics());
         body.add("$L", param.name);