From 5e4b214c6dd64d4f7c92509ebb4794b53634a9ec Mon Sep 17 00:00:00 2001
From: Ryan Nett <rnett@calpoly.edu>
Date: Mon, 25 Jan 2021 16:52:03 -0800
Subject: [PATCH] Remove extra generics from op generation (#193)

* Successfully remove extra type params, but it broke javadoc generation

Signed-off-by: Ryan Nett <rnett@calpoly.edu>

* Generate covariant types

Signed-off-by: Ryan Nett <rnett@calpoly.edu>

* Do generation

Signed-off-by: Ryan Nett <rnett@calpoly.edu>

* Update help text.

Signed-off-by: Ryan Nett <rnett@calpoly.edu>

* Fixes

Signed-off-by: Ryan Nett <rnett@calpoly.edu>
---
 .../src/bazel/op_generator/op_gen_main.cc     |   7 +-
 .../src/bazel/op_generator/op_specs.cc        |  55 +++
 .../src/bazel/op_generator/op_specs.h         |   7 +-
 .../org/tensorflow/op/DtypesOps.java          |   4 +-
 .../org/tensorflow/op/ImageOps.java           |  16 +-
 .../annotations/org/tensorflow/op/IoOps.java  |  20 +-
 .../org/tensorflow/op/LinalgOps.java          |  21 +-
 .../org/tensorflow/op/MathOps.java            |  91 +++--
 .../annotations/org/tensorflow/op/NnOps.java  |  30 +-
 .../org/tensorflow/op/NnRawOps.java           |   4 +-
 .../annotations/org/tensorflow/op/Ops.java    | 380 ++++++++----------
 .../org/tensorflow/op/QuantizationOps.java    |  15 +-
 .../org/tensorflow/op/RandomOps.java          |  85 ++--
 .../org/tensorflow/op/SignalOps.java          |  20 +-
 .../org/tensorflow/op/SparseOps.java          |  70 ++--
 .../org/tensorflow/op/StringsOps.java         |   4 +-
 .../org/tensorflow/op/SummaryOps.java         |  10 +-
 .../org/tensorflow/op/TrainOps.java           |  99 ++---
 .../annotations/org/tensorflow/op/XlaOps.java |  10 +-
 .../gen/java/org/tensorflow/op/core/All.java  |   2 +-
 .../gen/java/org/tensorflow/op/core/Any.java  |   2 +-
 .../op/core/AssignAddVariableOp.java          |   2 +-
 .../op/core/AssignSubVariableOp.java          |   2 +-
 .../tensorflow/op/core/AssignVariableOp.java  |   2 +-
 .../tensorflow/op/core/BarrierInsertMany.java |   2 +-
 .../org/tensorflow/op/core/BatchToSpace.java  |   2 +-
 .../tensorflow/op/core/BatchToSpaceNd.java    |   2 +-
 .../java/org/tensorflow/op/core/Bitcast.java  |   2 +-
 .../org/tensorflow/op/core/BroadcastTo.java   |   2 +-
 .../org/tensorflow/op/core/Bucketize.java     |   2 +-
 .../java/org/tensorflow/op/core/Concat.java   |   2 +-
 .../op/core/DummySeedGenerator.java           |  65 ---
 .../tensorflow/op/core/EmptyTensorList.java   |   2 +-
 .../org/tensorflow/op/core/ExpandDims.java    |   2 +-
 .../gen/java/org/tensorflow/op/core/Fill.java |   2 +-
 .../org/tensorflow/op/core/Fingerprint.java   |   2 +-
 .../java/org/tensorflow/op/core/Gather.java   |   2 +-
 .../java/org/tensorflow/op/core/GatherNd.java |   2 +-
 .../tensorflow/op/core/GetSessionHandle.java  |   2 +-
 .../tensorflow/op/core/InitializeTable.java   |   2 +-
 .../op/core/IsVariableInitialized.java        |   2 +-
 .../java/org/tensorflow/op/core/LinSpace.java |   2 +-
 .../tensorflow/op/core/LookupTableFind.java   |   2 +-
 .../tensorflow/op/core/LookupTableImport.java |   2 +-
 .../tensorflow/op/core/LookupTableInsert.java |   2 +-
 .../tensorflow/op/core/LookupTableRemove.java |   2 +-
 .../gen/java/org/tensorflow/op/core/Max.java  |   2 +-
 .../gen/java/org/tensorflow/op/core/Min.java  |   2 +-
 .../org/tensorflow/op/core/MirrorPad.java     |   2 +-
 .../org/tensorflow/op/core/MirrorPadGrad.java |   2 +-
 .../java/org/tensorflow/op/core/OneHot.java   |   2 +-
 .../gen/java/org/tensorflow/op/core/Pad.java  |   2 +-
 .../gen/java/org/tensorflow/op/core/Prod.java |   2 +-
 .../tensorflow/op/core/QuantizedReshape.java  |   2 +-
 .../gen/java/org/tensorflow/op/core/Rank.java |   2 +-
 .../org/tensorflow/op/core/ReduceAll.java     |   2 +-
 .../org/tensorflow/op/core/ReduceAny.java     |   2 +-
 .../org/tensorflow/op/core/ReduceMax.java     |   2 +-
 .../org/tensorflow/op/core/ReduceMin.java     |   2 +-
 .../org/tensorflow/op/core/ReduceProd.java    |   2 +-
 .../org/tensorflow/op/core/ReduceSum.java     |   2 +-
 .../java/org/tensorflow/op/core/Reshape.java  |   2 +-
 .../tensorflow/op/core/ResourceGather.java    |   2 +-
 .../tensorflow/op/core/ResourceGatherNd.java  |   2 +-
 .../op/core/ResourceScatterAdd.java           |   2 +-
 .../op/core/ResourceScatterDiv.java           |   2 +-
 .../op/core/ResourceScatterMax.java           |   2 +-
 .../op/core/ResourceScatterMin.java           |   2 +-
 .../op/core/ResourceScatterMul.java           |   2 +-
 .../op/core/ResourceScatterNdAdd.java         |   2 +-
 .../op/core/ResourceScatterNdMax.java         |   2 +-
 .../op/core/ResourceScatterNdMin.java         |   2 +-
 .../op/core/ResourceScatterNdSub.java         |   2 +-
 .../op/core/ResourceScatterNdUpdate.java      |   2 +-
 .../op/core/ResourceScatterSub.java           |   2 +-
 .../op/core/ResourceScatterUpdate.java        |   2 +-
 .../op/core/ResourceStridedSliceAssign.java   |   2 +-
 .../java/org/tensorflow/op/core/Reverse.java  |   2 +-
 .../tensorflow/op/core/ReverseSequence.java   |   2 +-
 .../gen/java/org/tensorflow/op/core/Roll.java |   2 +-
 .../org/tensorflow/op/core/ScatterAdd.java    |   2 +-
 .../org/tensorflow/op/core/ScatterDiv.java    |   2 +-
 .../org/tensorflow/op/core/ScatterMax.java    |   2 +-
 .../org/tensorflow/op/core/ScatterMin.java    |   2 +-
 .../org/tensorflow/op/core/ScatterMul.java    |   2 +-
 .../org/tensorflow/op/core/ScatterNdAdd.java  |   2 +-
 .../org/tensorflow/op/core/ScatterNdMax.java  |   2 +-
 .../org/tensorflow/op/core/ScatterNdMin.java  |   2 +-
 .../op/core/ScatterNdNonAliasingAdd.java      |   2 +-
 .../org/tensorflow/op/core/ScatterNdSub.java  |   2 +-
 .../tensorflow/op/core/ScatterNdUpdate.java   |   2 +-
 .../org/tensorflow/op/core/ScatterSub.java    |   2 +-
 .../org/tensorflow/op/core/ScatterUpdate.java |   2 +-
 .../gen/java/org/tensorflow/op/core/Send.java |   2 +-
 .../java/org/tensorflow/op/core/SetSize.java  |   2 +-
 .../java/org/tensorflow/op/core/Shape.java    |   4 +-
 .../gen/java/org/tensorflow/op/core/Size.java |   4 +-
 .../tensorflow/op/core/SpaceToBatchNd.java    |   2 +-
 .../java/org/tensorflow/op/core/SplitV.java   |   2 +-
 .../gen/java/org/tensorflow/op/core/Sum.java  |   2 +-
 .../op/core/TensorArrayScatter.java           |   2 +-
 .../tensorflow/op/core/TensorArraySplit.java  |   2 +-
 .../tensorflow/op/core/TensorArrayUnpack.java |   2 +-
 .../tensorflow/op/core/TensorArrayWrite.java  |   2 +-
 .../tensorflow/op/core/TensorListConcat.java  |   2 +-
 .../op/core/TensorListFromTensor.java         |   2 +-
 .../op/core/TensorListPushBack.java           |   2 +-
 .../op/core/TensorListPushBackBatch.java      |   2 +-
 .../tensorflow/op/core/TensorListReserve.java |   2 +-
 .../tensorflow/op/core/TensorListScatter.java |   2 +-
 .../TensorListScatterIntoExistingList.java    |   2 +-
 .../tensorflow/op/core/TensorListSetItem.java |   2 +-
 .../tensorflow/op/core/TensorListSplit.java   |   2 +-
 .../tensorflow/op/core/TensorScatterMax.java  |  75 ----
 .../tensorflow/op/core/TensorScatterMin.java  |  75 ----
 .../op/core/TensorScatterNdAdd.java           |   2 +-
 .../op/core/TensorScatterNdMax.java           |   2 +-
 .../op/core/TensorScatterNdMin.java           |   2 +-
 .../op/core/TensorScatterNdSub.java           |   2 +-
 .../op/core/TensorScatterNdUpdate.java        |   2 +-
 .../gen/java/org/tensorflow/op/core/Tile.java |   2 +-
 .../java/org/tensorflow/op/core/Unique.java   |   4 +-
 .../tensorflow/op/core/UniqueWithCounts.java  |   4 +-
 .../java/org/tensorflow/op/core/Where.java    |   2 +-
 .../op/data/SparseTensorSliceDataset.java     |   2 +-
 .../op/debugging/DebugNanCount.java           |   2 +-
 .../op/debugging/DebugNumericsSummary.java    |   4 +-
 .../org/tensorflow/op/dtypes/AsString.java    |   2 +-
 .../java/org/tensorflow/op/dtypes/Cast.java   |   2 +-
 .../java/org/tensorflow/op/dtypes/ToBool.java |   2 +-
 .../tensorflow/op/image/CropAndResize.java    |   2 +-
 .../op/image/CropAndResizeGradBoxes.java      |   2 +-
 .../org/tensorflow/op/image/EncodePng.java    |   2 +-
 .../org/tensorflow/op/image/ResizeArea.java   |   2 +-
 .../tensorflow/op/image/ResizeBicubic.java    |   2 +-
 .../tensorflow/op/image/ResizeBilinear.java   |   2 +-
 .../op/image/ScaleAndTranslate.java           |   2 +-
 .../tensorflow/op/io/SerializeManySparse.java |   4 +-
 .../org/tensorflow/op/io/SerializeSparse.java |   4 +-
 .../org/tensorflow/op/io/SerializeTensor.java |   2 +-
 .../op/linalg/ConjugateTranspose.java         |   2 +-
 .../java/org/tensorflow/op/linalg/Eig.java    |   2 +-
 .../tensorflow/op/linalg/EuclideanNorm.java   |   2 +-
 .../tensorflow/op/linalg/QuantizedMatMul.java |   2 +-
 .../op/linalg/QuantizedMatMulWithBias.java    |   2 +-
 .../QuantizedMatMulWithBiasAndRelu.java       |   2 +-
 ...zedMatMulWithBiasAndReluAndRequantize.java |   2 +-
 .../org/tensorflow/op/linalg/Transpose.java   |   2 +-
 .../linalg/sparse/DenseToCSRSparseMatrix.java |   2 +-
 .../op/linalg/sparse/SparseMatrixMul.java     |   2 +-
 .../sparse/SparseTensorToCSRSparseMatrix.java |   2 +-
 .../java/org/tensorflow/op/math/Angle.java    |   4 +-
 .../java/org/tensorflow/op/math/ArgMax.java   |   4 +-
 .../java/org/tensorflow/op/math/ArgMin.java   |   4 +-
 .../org/tensorflow/op/math/ComplexAbs.java    |   4 +-
 .../java/org/tensorflow/op/math/Cumprod.java  |   2 +-
 .../java/org/tensorflow/op/math/Cumsum.java   |   2 +-
 .../op/math/CumulativeLogsumexp.java          |   2 +-
 .../gen/java/org/tensorflow/op/math/Imag.java |   4 +-
 .../java/org/tensorflow/op/math/IsFinite.java |   2 +-
 .../java/org/tensorflow/op/math/IsInf.java    |   2 +-
 .../java/org/tensorflow/op/math/IsNan.java    |   2 +-
 .../gen/java/org/tensorflow/op/math/Mean.java |   2 +-
 .../tensorflow/op/math/PopulationCount.java   |   2 +-
 .../org/tensorflow/op/math/QuantizedAdd.java  |   2 +-
 .../org/tensorflow/op/math/QuantizedMul.java  |   2 +-
 .../gen/java/org/tensorflow/op/math/Real.java |   4 +-
 .../math/RequantizationRangePerChannel.java   |   2 +-
 .../op/math/RequantizePerChannel.java         |   2 +-
 .../org/tensorflow/op/math/SegmentMax.java    |   2 +-
 .../org/tensorflow/op/math/SegmentMean.java   |   2 +-
 .../org/tensorflow/op/math/SegmentMin.java    |   2 +-
 .../org/tensorflow/op/math/SegmentProd.java   |   2 +-
 .../org/tensorflow/op/math/SegmentSum.java    |   2 +-
 .../op/math/UnsortedSegmentMax.java           |   2 +-
 .../op/math/UnsortedSegmentMin.java           |   2 +-
 .../op/math/UnsortedSegmentProd.java          |   2 +-
 .../op/math/UnsortedSegmentSum.java           |   2 +-
 .../tensorflow/op/nn/Conv3dBackpropInput.java |   2 +-
 .../op/nn/MaxPoolGradGradWithArgmax.java      |   2 +-
 .../op/nn/MaxPoolGradWithArgmax.java          |   2 +-
 .../tensorflow/op/nn/QuantizedBiasAdd.java    |   2 +-
 .../op/nn/QuantizedConv2DAndRelu.java         |   2 +-
 .../QuantizedConv2DAndReluAndRequantize.java  |   2 +-
 .../op/nn/QuantizedConv2DAndRequantize.java   |   2 +-
 .../op/nn/QuantizedConv2DPerChannel.java      |   2 +-
 .../op/nn/QuantizedConv2DWithBias.java        |   2 +-
 .../op/nn/QuantizedConv2DWithBiasAndRelu.java |   2 +-
 ...zedConv2DWithBiasAndReluAndRequantize.java |   2 +-
 .../QuantizedConv2DWithBiasAndRequantize.java |   2 +-
 ...WithBiasSignedSumAndReluAndRequantize.java |   2 +-
 .../nn/QuantizedConv2DWithBiasSumAndRelu.java |   2 +-
 ...Conv2DWithBiasSumAndReluAndRequantize.java |   2 +-
 .../org/tensorflow/op/nn/QuantizedConv2d.java |   2 +-
 .../op/nn/QuantizedDepthwiseConv2D.java       |   2 +-
 .../nn/QuantizedDepthwiseConv2DWithBias.java  |   2 +-
 ...antizedDepthwiseConv2DWithBiasAndRelu.java |   2 +-
 ...iseConv2DWithBiasAndReluAndRequantize.java |   2 +-
 .../org/tensorflow/op/nn/QuantizedRelu.java   |   2 +-
 .../org/tensorflow/op/nn/QuantizedRelu6.java  |   2 +-
 .../org/tensorflow/op/nn/QuantizedReluX.java  |   2 +-
 .../org/tensorflow/op/nn/SpaceToBatch.java    |   2 +-
 .../SparseSoftmaxCrossEntropyWithLogits.java  |   2 +-
 .../op/quantization/Dequantize.java           |   4 +-
 .../QuantizeDownAndShrinkRange.java           |   2 +-
 .../QuantizedMatMulWithBiasAndDequantize.java |   2 +-
 .../QuantizedMatMulWithBiasAndRequantize.java |   2 +-
 .../op/quantization/RequantizationRange.java  |   2 +-
 .../op/quantization/Requantize.java           |   2 +-
 .../op/ragged/RaggedCountSparseOutput.java    |   2 +-
 .../tensorflow/op/ragged/RaggedGather.java    |   2 +-
 .../op/ragged/RaggedTensorToTensor.java       |   2 +-
 .../op/ragged/RaggedTensorToVariant.java      |   2 +-
 .../org/tensorflow/op/random/Multinomial.java |   4 +-
 .../op/random/NonDeterministicInts.java       |   4 +-
 .../random/ParameterizedTruncatedNormal.java  |   2 +-
 .../org/tensorflow/op/random/RandomGamma.java |   2 +-
 .../tensorflow/op/random/RandomPoisson.java   |   4 +-
 .../op/random/RandomStandardNormal.java       |   2 +-
 .../tensorflow/op/random/RandomUniform.java   |   2 +-
 .../op/random/RandomUniformInt.java           |   2 +-
 .../op/random/StatefulRandomBinomial.java     |   4 +-
 .../op/random/StatefulStandardNormal.java     |   4 +-
 .../op/random/StatefulTruncatedNormal.java    |   4 +-
 .../tensorflow/op/random/StatefulUniform.java |   4 +-
 .../op/random/StatefulUniformFullInt.java     |   2 +-
 .../op/random/StatefulUniformInt.java         |   2 +-
 .../op/random/StatelessMultinomial.java       |   4 +-
 ...StatelessParameterizedTruncatedNormal.java |   2 +-
 .../op/random/StatelessRandomBinomial.java    |   4 +-
 .../op/random/StatelessRandomGamma.java       |   2 +-
 .../op/random/StatelessRandomNormal.java      |   4 +-
 .../op/random/StatelessRandomPoisson.java     |   2 +-
 .../op/random/StatelessRandomUniform.java     |   4 +-
 .../random/StatelessRandomUniformFullInt.java |   2 +-
 .../op/random/StatelessRandomUniformInt.java  |   2 +-
 .../op/random/StatelessTruncatedNormal.java   |   4 +-
 .../tensorflow/op/random/TruncatedNormal.java |   2 +-
 .../java/org/tensorflow/op/signal/Irfft.java  |   4 +-
 .../org/tensorflow/op/signal/Irfft2d.java     |   4 +-
 .../org/tensorflow/op/signal/Irfft3d.java     |   4 +-
 .../java/org/tensorflow/op/signal/Rfft.java   |   2 +-
 .../java/org/tensorflow/op/signal/Rfft2d.java |   2 +-
 .../java/org/tensorflow/op/signal/Rfft3d.java |   2 +-
 .../op/sparse/AddManySparseToTensorsMap.java  |   2 +-
 .../op/sparse/AddSparseToTensorsMap.java      |   2 +-
 .../op/sparse/DenseCountSparseOutput.java     |   2 +-
 .../op/sparse/DeserializeSparse.java          |   2 +-
 .../SparseAccumulatorApplyGradient.java       |   2 +-
 .../org/tensorflow/op/sparse/SparseAdd.java   |   2 +-
 .../op/sparse/SparseCountSparseOutput.java    |   2 +-
 .../tensorflow/op/sparse/SparseMatMul.java    |   2 +-
 .../op/sparse/SparseSegmentMean.java          |   2 +-
 .../op/sparse/SparseSegmentMeanGrad.java      |   2 +-
 .../SparseSegmentMeanWithNumSegments.java     |   2 +-
 .../op/sparse/SparseSegmentSqrtN.java         |   2 +-
 .../op/sparse/SparseSegmentSqrtNGrad.java     |   2 +-
 .../SparseSegmentSqrtNWithNumSegments.java    |   2 +-
 .../op/sparse/SparseSegmentSum.java           |   2 +-
 .../SparseSegmentSumWithNumSegments.java      |   2 +-
 .../op/sparse/SparseTensorDenseMatMul.java    |   2 +-
 .../tensorflow/op/strings/UnicodeEncode.java  |   2 +-
 .../op/strings/UnsortedSegmentJoin.java       |   2 +-
 .../op/summary/HistogramSummary.java          |   2 +-
 .../tensorflow/op/summary/ImageSummary.java   |   2 +-
 .../tensorflow/op/summary/ScalarSummary.java  |   2 +-
 .../tensorflow/op/summary/TensorSummary.java  |   2 +-
 .../op/summary/WriteHistogramSummary.java     |   2 +-
 .../op/summary/WriteImageSummary.java         |   2 +-
 .../op/summary/WriteScalarSummary.java        |   2 +-
 .../tensorflow/op/summary/WriteSummary.java   |   2 +-
 .../org/tensorflow/op/tpu/InfeedEnqueue.java  |   2 +-
 .../org/tensorflow/op/tpu/OutfeedEnqueue.java |   2 +-
 .../org/tensorflow/op/tpu/Prelinearize.java   |   2 +-
 .../op/train/AccumulatorApplyGradient.java    |   2 +-
 .../ResourceAccumulatorApplyGradient.java     |   2 +-
 .../op/train/ResourceSparseApplyAdadelta.java |   2 +-
 .../op/train/ResourceSparseApplyAdagrad.java  |   2 +-
 .../train/ResourceSparseApplyAdagradDa.java   |   2 +-
 .../train/ResourceSparseApplyAdagradV2.java   |   2 +-
 .../ResourceSparseApplyCenteredRmsProp.java   |   2 +-
 .../op/train/ResourceSparseApplyFtrl.java     |   2 +-
 .../ResourceSparseApplyKerasMomentum.java     |   2 +-
 .../op/train/ResourceSparseApplyMomentum.java |   2 +-
 .../ResourceSparseApplyProximalAdagrad.java   |   2 +-
 ...rceSparseApplyProximalGradientDescent.java |   2 +-
 .../op/train/ResourceSparseApplyRmsProp.java  |   2 +-
 .../op/train/SparseApplyAdadelta.java         |   2 +-
 .../op/train/SparseApplyAdagrad.java          |   2 +-
 .../op/train/SparseApplyAdagradDa.java        |   2 +-
 .../op/train/SparseApplyCenteredRmsProp.java  |   2 +-
 .../tensorflow/op/train/SparseApplyFtrl.java  |   2 +-
 .../op/train/SparseApplyMomentum.java         |   2 +-
 .../op/train/SparseApplyProximalAdagrad.java  |   2 +-
 .../SparseApplyProximalGradientDescent.java   |   2 +-
 .../op/train/SparseApplyRmsProp.java          |   2 +-
 .../tensorflow/op/xla/BroadcastHelper.java    |   2 +-
 .../tensorflow/op/xla/DynamicUpdateSlice.java |   2 +-
 .../gen/java/org/tensorflow/op/xla/Send.java  |   2 +-
 299 files changed, 797 insertions(+), 978 deletions(-)
 delete mode 100644 tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummySeedGenerator.java
 delete mode 100644 tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterMax.java
 delete mode 100644 tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterMin.java

diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_gen_main.cc b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_gen_main.cc
index f35a84b8178..5ab9c820832 100644
--- a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_gen_main.cc
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_gen_main.cc
@@ -34,6 +34,9 @@ const char kUsageHeader[] =
     "provided list of libraries. A wrapper exposes an intuitive and\n"
 	"strongly-typed interface for building its underlying operation and linking "
 	"it into a graph.\n\n"
+    "The first argument is the location of the tensorflow binary built for TF-"
+    "Java.\nFor example, `bazel-out/k8-opt/bin/external/org_tensorflow/tensorfl"
+    "ow/libtensorflow_cc.so`.\n\n"
     "Operation wrappers are generated under the path specified by the "
     "'--output_dir' argument. This path can be absolute or relative to the\n"
     "current working directory and will be created if it does not exist.\n\n"
@@ -45,7 +48,9 @@ const char kUsageHeader[] =
     "Finally, the `--api_dirs` argument takes a list of comma-separated "
     "directories of API definitions can be provided to override default\n"
     "values found in the ops definitions. Directories are ordered by priority "
-    "(the last having precedence over the first).\n\n";
+    "(the last having precedence over the first).\nFor example, `bazel-tensorf"
+    "low-core-api/external/org_tensorflow/tensorflow/core/api_def/base_api,src"
+    "/bazel/api_def`\n\n";
 
 }  // namespace java
 }  // namespace tensorflow
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc
index 56de15d9ab7..d0567b4eb83 100644
--- a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc
@@ -391,8 +391,63 @@ OpSpec OpSpec::Create(const OpDef& op_def, const ApiDef& api_def) {
   for (const auto& endpoint_def : api_def.endpoint()) {
     op.endpoints_.push_back(CreateEndpoint(op_def, api_def, endpoint_def));
   }
+  op.RemoveExtraGenerics();
   return op;
 }
 
+void OpSpec::RemoveExtraGenerics() {
+  std::map<string, int> generics;
+
+  for (const ArgumentSpec& output : this->outputs()) {
+    if (output.type().kind() == Type::GENERIC && !output.type().wildcard()) {
+      if (generics.find(output.type().name()) == generics.end()) {
+        generics[output.type().name()] = 1;
+      } else {
+        generics[output.type().name()] = generics.find(output.type().name())->second + 1;
+      }
+    }
+  }
+
+  for (const ArgumentSpec& input : this->inputs()) {
+    if (input.type().kind() == Type::GENERIC && !input.type().wildcard()) {
+      if (generics.find(input.type().name()) == generics.end()) {
+        generics[input.type().name()] = 1;
+      } else {
+        generics[input.type().name()] = generics.find(input.type().name())->second + 1;
+      }
+    }
+  }
+
+  for (ArgumentSpec& output : this->outputs_) {
+    if (output.type().kind() == Type::GENERIC && !output.type().wildcard()) {
+      if (generics[output.type().name()] <= 1) {
+        output.toUpperBound();
+      }
+    }
+  }
+
+  for (ArgumentSpec& input : this->inputs_) {
+    if (generics[input.type().name()] <= 1) {
+      input.toUpperBound();
+    }
+  }
+}
+
+void ArgumentSpec::toUpperBound() {
+  if(this->type().kind() == Type::GENERIC && this->var().type().name() == "Operand" &&
+     this->type().supertypes().size() == 1){
+    Type newType = Type::Wildcard().add_supertype(this->type().supertypes().front());
+    Type varType = Type::Interface("Operand", "org.tensorflow").add_parameter(newType);
+
+    if(this->var().variadic()){
+      this->var_ = Variable::Varargs(this->var().name(), varType);
+    } else {
+      this->var_ = Variable::Create(this->var().name(), varType);
+    }
+
+    this->type_ = newType;
+  }
+}
+
 }  // namespace java
 }  // namespace tensorflow
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.h b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.h
index 40d72656561..493dc777384 100644
--- a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.h
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.h
@@ -74,13 +74,14 @@ class ArgumentSpec {
   const string& op_def_name() const { return op_def_name_; }
   const Variable& var() const { return var_; }
   const Type& type() const { return type_; }
+  void toUpperBound();
   const string& description() const { return description_; }
   bool iterable() const { return iterable_; }
 
  private:
   const string op_def_name_;
-  const Variable var_;
-  const Type type_;
+  Variable var_;
+  Type type_;
   const string description_;
   const bool iterable_;
 };
@@ -164,6 +165,8 @@ class OpSpec {
         hidden_(hidden),
         deprecation_explanation_(deprecation_explanation) {}
 
+  void RemoveExtraGenerics();
+
   const string graph_op_name_;
   const bool hidden_;
   const string deprecation_explanation_;
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DtypesOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DtypesOps.java
index acf6a748b70..b4a7373e862 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DtypesOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DtypesOps.java
@@ -59,7 +59,7 @@ public final class DtypesOps {
    * @param options carries optional attributes values
    * @return a new instance of AsString
    */
-  public <T extends TType> AsString asString(Operand<T> input, AsString.Options... options) {
+  public AsString asString(Operand<? extends TType> input, AsString.Options... options) {
     return AsString.create(scope, input, options);
   }
 
@@ -72,7 +72,7 @@ public <T extends TType> AsString asString(Operand<T> input, AsString.Options...
    * @param options carries optional attributes values
    * @return a new instance of Cast
    */
-  public <U extends TType, T extends TType> Cast<U> cast(Operand<T> x, Class<U> DstT,
+  public <U extends TType> Cast<U> cast(Operand<? extends TType> x, Class<U> DstT,
       Cast.Options... options) {
     return Cast.create(scope, x, DstT, options);
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/ImageOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/ImageOps.java
index 13db1243c8a..9ef048655ba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/ImageOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/ImageOps.java
@@ -213,7 +213,7 @@ public CombinedNonMaxSuppression combinedNonMaxSuppression(Operand<TFloat32> box
    * @param options carries optional attributes values
    * @return a new instance of CropAndResize
    */
-  public <T extends TNumber> CropAndResize cropAndResize(Operand<T> image, Operand<TFloat32> boxes,
+  public CropAndResize cropAndResize(Operand<? extends TNumber> image, Operand<TFloat32> boxes,
       Operand<TInt32> boxInd, Operand<TInt32> cropSize, CropAndResize.Options... options) {
     return CropAndResize.create(scope, image, boxes, boxInd, cropSize, options);
   }
@@ -239,8 +239,8 @@ public <T extends TNumber> CropAndResize cropAndResize(Operand<T> image, Operand
    * @param options carries optional attributes values
    * @return a new instance of CropAndResizeGradBoxes
    */
-  public <T extends TNumber> CropAndResizeGradBoxes cropAndResizeGradBoxes(Operand<TFloat32> grads,
-      Operand<T> image, Operand<TFloat32> boxes, Operand<TInt32> boxInd,
+  public CropAndResizeGradBoxes cropAndResizeGradBoxes(Operand<TFloat32> grads,
+      Operand<? extends TNumber> image, Operand<TFloat32> boxes, Operand<TInt32> boxInd,
       CropAndResizeGradBoxes.Options... options) {
     return CropAndResizeGradBoxes.create(scope, grads, image, boxes, boxInd, options);
   }
@@ -573,7 +573,7 @@ public EncodeJpegVariableQuality encodeJpegVariableQuality(Operand<TUint8> image
    * @param options carries optional attributes values
    * @return a new instance of EncodePng
    */
-  public <T extends TNumber> EncodePng encodePng(Operand<T> image, EncodePng.Options... options) {
+  public EncodePng encodePng(Operand<? extends TNumber> image, EncodePng.Options... options) {
     return EncodePng.create(scope, image, options);
   }
 
@@ -791,7 +791,7 @@ public <T extends TNumber> RandomCrop<T> randomCrop(Operand<T> image, Operand<TI
    * @param options carries optional attributes values
    * @return a new instance of ResizeArea
    */
-  public <T extends TNumber> ResizeArea resizeArea(Operand<T> images, Operand<TInt32> size,
+  public ResizeArea resizeArea(Operand<? extends TNumber> images, Operand<TInt32> size,
       ResizeArea.Options... options) {
     return ResizeArea.create(scope, images, size, options);
   }
@@ -807,7 +807,7 @@ public <T extends TNumber> ResizeArea resizeArea(Operand<T> images, Operand<TInt
    * @param options carries optional attributes values
    * @return a new instance of ResizeBicubic
    */
-  public <T extends TNumber> ResizeBicubic resizeBicubic(Operand<T> images, Operand<TInt32> size,
+  public ResizeBicubic resizeBicubic(Operand<? extends TNumber> images, Operand<TInt32> size,
       ResizeBicubic.Options... options) {
     return ResizeBicubic.create(scope, images, size, options);
   }
@@ -823,7 +823,7 @@ public <T extends TNumber> ResizeBicubic resizeBicubic(Operand<T> images, Operan
    * @param options carries optional attributes values
    * @return a new instance of ResizeBilinear
    */
-  public <T extends TNumber> ResizeBilinear resizeBilinear(Operand<T> images, Operand<TInt32> size,
+  public ResizeBilinear resizeBilinear(Operand<? extends TNumber> images, Operand<TInt32> size,
       ResizeBilinear.Options... options) {
     return ResizeBilinear.create(scope, images, size, options);
   }
@@ -939,7 +939,7 @@ public <T extends TNumber> SampleDistortedBoundingBox<T> sampleDistortedBounding
    * @param options carries optional attributes values
    * @return a new instance of ScaleAndTranslate
    */
-  public <T extends TNumber> ScaleAndTranslate scaleAndTranslate(Operand<T> images,
+  public ScaleAndTranslate scaleAndTranslate(Operand<? extends TNumber> images,
       Operand<TInt32> size, Operand<TFloat32> scale, Operand<TFloat32> translation,
       ScaleAndTranslate.Options... options) {
     return ScaleAndTranslate.create(scope, images, size, scale, translation, options);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/IoOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/IoOps.java
index f8d48de3690..f73859d91b9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/IoOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/IoOps.java
@@ -895,8 +895,8 @@ public ReaderSerializeState readerSerializeState(Operand<?> readerHandle) {
    * @param sparseShape 1-D.  The `shape` of the minibatch `SparseTensor`.
    * @return a new instance of SerializeManySparse
    */
-  public <T extends TType> SerializeManySparse<TString> serializeManySparse(
-      Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape) {
+  public SerializeManySparse<TString> serializeManySparse(Operand<TInt64> sparseIndices,
+      Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape) {
     return SerializeManySparse.create(scope, sparseIndices, sparseValues, sparseShape);
   }
 
@@ -919,9 +919,8 @@ public <T extends TType> SerializeManySparse<TString> serializeManySparse(
    *  (default) and `variant`.
    * @return a new instance of SerializeManySparse
    */
-  public <U extends TType, T extends TType> SerializeManySparse<U> serializeManySparse(
-      Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape,
-      Class<U> outType) {
+  public <U extends TType> SerializeManySparse<U> serializeManySparse(Operand<TInt64> sparseIndices,
+      Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape, Class<U> outType) {
     return SerializeManySparse.create(scope, sparseIndices, sparseValues, sparseShape, outType);
   }
 
@@ -934,8 +933,8 @@ public <U extends TType, T extends TType> SerializeManySparse<U> serializeManySp
    * @param sparseShape 1-D.  The `shape` of the `SparseTensor`.
    * @return a new instance of SerializeSparse
    */
-  public <T extends TType> SerializeSparse<TString> serializeSparse(Operand<TInt64> sparseIndices,
-      Operand<T> sparseValues, Operand<TInt64> sparseShape) {
+  public SerializeSparse<TString> serializeSparse(Operand<TInt64> sparseIndices,
+      Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape) {
     return SerializeSparse.create(scope, sparseIndices, sparseValues, sparseShape);
   }
 
@@ -950,9 +949,8 @@ public <T extends TType> SerializeSparse<TString> serializeSparse(Operand<TInt64
    *  (default) and `variant`.
    * @return a new instance of SerializeSparse
    */
-  public <U extends TType, T extends TType> SerializeSparse<U> serializeSparse(
-      Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape,
-      Class<U> outType) {
+  public <U extends TType> SerializeSparse<U> serializeSparse(Operand<TInt64> sparseIndices,
+      Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape, Class<U> outType) {
     return SerializeSparse.create(scope, sparseIndices, sparseValues, sparseShape, outType);
   }
 
@@ -962,7 +960,7 @@ public <U extends TType, T extends TType> SerializeSparse<U> serializeSparse(
    * @param tensor A Tensor of type `T`.
    * @return a new instance of SerializeTensor
    */
-  public <T extends TType> SerializeTensor serializeTensor(Operand<T> tensor) {
+  public SerializeTensor serializeTensor(Operand<? extends TType> tensor) {
     return SerializeTensor.create(scope, tensor);
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/LinalgOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/LinalgOps.java
index f15c50fe691..f5d8d22e85e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/LinalgOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/LinalgOps.java
@@ -342,8 +342,8 @@ public <T extends TNumber> CholeskyGrad<T> choleskyGrad(Operand<T> l, Operand<T>
    * @param perm
    * @return a new instance of ConjugateTranspose
    */
-  public <T extends TType, U extends TNumber> ConjugateTranspose<T> conjugateTranspose(Operand<T> x,
-      Operand<U> perm) {
+  public <T extends TType> ConjugateTranspose<T> conjugateTranspose(Operand<T> x,
+      Operand<? extends TNumber> perm) {
     return ConjugateTranspose.create(scope, x, perm);
   }
 
@@ -398,7 +398,7 @@ public <T extends TType> Det<T> det(Operand<T> input) {
    * @param options carries optional attributes values
    * @return a new instance of Eig
    */
-  public <U extends TType, T extends TType> Eig<U> eig(Operand<T> input, Class<U> Tout,
+  public <U extends TType> Eig<U> eig(Operand<? extends TType> input, Class<U> Tout,
       Eig.Options... options) {
     return Eig.create(scope, input, Tout, options);
   }
@@ -505,8 +505,8 @@ public <T extends TType> Einsum<T> einsum(Iterable<Operand<T>> inputs, String eq
    * @param options carries optional attributes values
    * @return a new instance of EuclideanNorm
    */
-  public <T extends TType, U extends TNumber> EuclideanNorm<T> euclideanNorm(Operand<T> input,
-      Operand<U> axis, EuclideanNorm.Options... options) {
+  public <T extends TType> EuclideanNorm<T> euclideanNorm(Operand<T> input,
+      Operand<? extends TNumber> axis, EuclideanNorm.Options... options) {
     return EuclideanNorm.create(scope, input, axis, options);
   }
 
@@ -1373,10 +1373,10 @@ public <T extends TType> Qr<T> qr(Operand<T> input, Qr.Options... options) {
    * @param options carries optional attributes values
    * @return a new instance of QuantizedMatMul
    */
-  public <V extends TType, T extends TType, U extends TType, W extends TType> QuantizedMatMul<V> quantizedMatMul(
-      Operand<T> a, Operand<U> b, Operand<TFloat32> minA, Operand<TFloat32> maxA,
-      Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<V> Toutput, Class<W> Tactivation,
-      QuantizedMatMul.Options... options) {
+  public <V extends TType, W extends TType> QuantizedMatMul<V> quantizedMatMul(
+      Operand<? extends TType> a, Operand<? extends TType> b, Operand<TFloat32> minA,
+      Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<V> Toutput,
+      Class<W> Tactivation, QuantizedMatMul.Options... options) {
     return QuantizedMatMul.create(scope, a, b, minA, maxA, minB, maxB, Toutput, Tactivation, options);
   }
 
@@ -1544,8 +1544,7 @@ public <T extends TType> TensorDiagPart<T> tensorDiagPart(Operand<T> input) {
    * @param perm
    * @return a new instance of Transpose
    */
-  public <T extends TType, U extends TNumber> Transpose<T> transpose(Operand<T> x,
-      Operand<U> perm) {
+  public <T extends TType> Transpose<T> transpose(Operand<T> x, Operand<? extends TNumber> perm) {
     return Transpose.create(scope, x, perm);
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/MathOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/MathOps.java
index 252a84fd745..5027828c262 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/MathOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/MathOps.java
@@ -264,7 +264,7 @@ public <T extends TType> AddN<T> addN(Iterable<Operand<T>> inputs) {
    * @param input
    * @return a new instance of Angle
    */
-  public <T extends TType> Angle<TFloat32> angle(Operand<T> input) {
+  public Angle<TFloat32> angle(Operand<? extends TType> input) {
     return Angle.create(scope, input);
   }
 
@@ -291,7 +291,7 @@ public <T extends TType> Angle<TFloat32> angle(Operand<T> input) {
    * @param Tout
    * @return a new instance of Angle
    */
-  public <U extends TNumber, T extends TType> Angle<U> angle(Operand<T> input, Class<U> Tout) {
+  public <U extends TNumber> Angle<U> angle(Operand<? extends TType> input, Class<U> Tout) {
     return Angle.create(scope, input, Tout);
   }
 
@@ -330,8 +330,8 @@ public <T extends TType> ApproximateEqual approximateEqual(Operand<T> x, Operand
    *  use dimension = 0.
    * @return a new instance of ArgMax
    */
-  public <T extends TType, U extends TNumber> ArgMax<TInt64> argMax(Operand<T> input,
-      Operand<U> dimension) {
+  public ArgMax<TInt64> argMax(Operand<? extends TType> input,
+      Operand<? extends TNumber> dimension) {
     return ArgMax.create(scope, input, dimension);
   }
 
@@ -358,8 +358,8 @@ public <T extends TType, U extends TNumber> ArgMax<TInt64> argMax(Operand<T> inp
    * @param outputType
    * @return a new instance of ArgMax
    */
-  public <V extends TNumber, T extends TType, U extends TNumber> ArgMax<V> argMax(Operand<T> input,
-      Operand<U> dimension, Class<V> outputType) {
+  public <V extends TNumber> ArgMax<V> argMax(Operand<? extends TType> input,
+      Operand<? extends TNumber> dimension, Class<V> outputType) {
     return ArgMax.create(scope, input, dimension, outputType);
   }
 
@@ -385,8 +385,8 @@ public <V extends TNumber, T extends TType, U extends TNumber> ArgMax<V> argMax(
    *  use dimension = 0.
    * @return a new instance of ArgMin
    */
-  public <T extends TType, U extends TNumber> ArgMin<TInt64> argMin(Operand<T> input,
-      Operand<U> dimension) {
+  public ArgMin<TInt64> argMin(Operand<? extends TType> input,
+      Operand<? extends TNumber> dimension) {
     return ArgMin.create(scope, input, dimension);
   }
 
@@ -413,8 +413,8 @@ public <T extends TType, U extends TNumber> ArgMin<TInt64> argMin(Operand<T> inp
    * @param outputType
    * @return a new instance of ArgMin
    */
-  public <V extends TNumber, T extends TType, U extends TNumber> ArgMin<V> argMin(Operand<T> input,
-      Operand<U> dimension, Class<V> outputType) {
+  public <V extends TNumber> ArgMin<V> argMin(Operand<? extends TType> input,
+      Operand<? extends TNumber> dimension, Class<V> outputType) {
     return ArgMin.create(scope, input, dimension, outputType);
   }
 
@@ -635,7 +635,7 @@ public <T extends TType> CompareAndBitpack compareAndBitpack(Operand<T> input,
    * @param x
    * @return a new instance of ComplexAbs
    */
-  public <T extends TType> ComplexAbs<TFloat32> complexAbs(Operand<T> x) {
+  public ComplexAbs<TFloat32> complexAbs(Operand<? extends TType> x) {
     return ComplexAbs.create(scope, x);
   }
 
@@ -652,8 +652,7 @@ public <T extends TType> ComplexAbs<TFloat32> complexAbs(Operand<T> x) {
    * @param Tout
    * @return a new instance of ComplexAbs
    */
-  public <U extends TNumber, T extends TType> ComplexAbs<U> complexAbs(Operand<T> x,
-      Class<U> Tout) {
+  public <U extends TNumber> ComplexAbs<U> complexAbs(Operand<? extends TType> x, Class<U> Tout) {
     return ComplexAbs.create(scope, x, Tout);
   }
 
@@ -756,7 +755,7 @@ public <T extends TType> Cosh<T> cosh(Operand<T> x) {
    * @param options carries optional attributes values
    * @return a new instance of Cumprod
    */
-  public <T extends TType, U extends TNumber> Cumprod<T> cumprod(Operand<T> x, Operand<U> axis,
+  public <T extends TType> Cumprod<T> cumprod(Operand<T> x, Operand<? extends TNumber> axis,
       Cumprod.Options... options) {
     return Cumprod.create(scope, x, axis, options);
   }
@@ -795,7 +794,7 @@ public <T extends TType, U extends TNumber> Cumprod<T> cumprod(Operand<T> x, Ope
    * @param options carries optional attributes values
    * @return a new instance of Cumsum
    */
-  public <T extends TType, U extends TNumber> Cumsum<T> cumsum(Operand<T> x, Operand<U> axis,
+  public <T extends TType> Cumsum<T> cumsum(Operand<T> x, Operand<? extends TNumber> axis,
       Cumsum.Options... options) {
     return Cumsum.create(scope, x, axis, options);
   }
@@ -1157,7 +1156,7 @@ public <T extends TNumber> Igammac<T> igammac(Operand<T> a, Operand<T> x) {
    * @param input
    * @return a new instance of Imag
    */
-  public <T extends TType> Imag<TFloat32> imag(Operand<T> input) {
+  public Imag<TFloat32> imag(Operand<? extends TType> input) {
     return Imag.create(scope, input);
   }
 
@@ -1180,7 +1179,7 @@ public <T extends TType> Imag<TFloat32> imag(Operand<T> input) {
    * @param Tout
    * @return a new instance of Imag
    */
-  public <U extends TNumber, T extends TType> Imag<U> imag(Operand<T> input, Class<U> Tout) {
+  public <U extends TNumber> Imag<U> imag(Operand<? extends TType> input, Class<U> Tout) {
     return Imag.create(scope, input, Tout);
   }
 
@@ -1224,7 +1223,7 @@ public <T extends TNumber> InvertPermutation<T> invertPermutation(Operand<T> x)
    * @param x
    * @return a new instance of IsFinite
    */
-  public <T extends TNumber> IsFinite isFinite(Operand<T> x) {
+  public IsFinite isFinite(Operand<? extends TNumber> x) {
     return IsFinite.create(scope, x);
   }
 
@@ -1242,7 +1241,7 @@ public <T extends TNumber> IsFinite isFinite(Operand<T> x) {
    * @param x
    * @return a new instance of IsInf
    */
-  public <T extends TNumber> IsInf isInf(Operand<T> x) {
+  public IsInf isInf(Operand<? extends TNumber> x) {
     return IsInf.create(scope, x);
   }
 
@@ -1260,7 +1259,7 @@ public <T extends TNumber> IsInf isInf(Operand<T> x) {
    * @param x
    * @return a new instance of IsNan
    */
-  public <T extends TNumber> IsNan isNan(Operand<T> x) {
+  public IsNan isNan(Operand<? extends TNumber> x) {
     return IsNan.create(scope, x);
   }
 
@@ -1440,7 +1439,7 @@ public <T extends TNumber> Maximum<T> maximum(Operand<T> x, Operand<T> y) {
    * @param options carries optional attributes values
    * @return a new instance of Mean
    */
-  public <T extends TType, U extends TNumber> Mean<T> mean(Operand<T> input, Operand<U> axis,
+  public <T extends TType> Mean<T> mean(Operand<T> input, Operand<? extends TNumber> axis,
       Mean.Options... options) {
     return Mean.create(scope, input, axis, options);
   }
@@ -1598,7 +1597,7 @@ public <T extends TNumber> Polygamma<T> polygamma(Operand<T> a, Operand<T> x) {
    * @param x
    * @return a new instance of PopulationCount
    */
-  public <T extends TNumber> PopulationCount populationCount(Operand<T> x) {
+  public PopulationCount populationCount(Operand<? extends TNumber> x) {
     return PopulationCount.create(scope, x);
   }
 
@@ -1635,8 +1634,8 @@ public <T extends TType> Pow<T> pow(Operand<T> x, Operand<T> y) {
    * @param Toutput
    * @return a new instance of QuantizedAdd
    */
-  public <V extends TType, T extends TType, U extends TType> QuantizedAdd<V> quantizedAdd(
-      Operand<T> x, Operand<U> y, Operand<TFloat32> minX, Operand<TFloat32> maxX,
+  public <V extends TType> QuantizedAdd<V> quantizedAdd(Operand<? extends TType> x,
+      Operand<? extends TType> y, Operand<TFloat32> minX, Operand<TFloat32> maxX,
       Operand<TFloat32> minY, Operand<TFloat32> maxY, Class<V> Toutput) {
     return QuantizedAdd.create(scope, x, y, minX, maxX, minY, maxY, Toutput);
   }
@@ -1654,8 +1653,8 @@ public <V extends TType, T extends TType, U extends TType> QuantizedAdd<V> quant
    * @param Toutput
    * @return a new instance of QuantizedMul
    */
-  public <V extends TType, T extends TType, U extends TType> QuantizedMul<V> quantizedMul(
-      Operand<T> x, Operand<U> y, Operand<TFloat32> minX, Operand<TFloat32> maxX,
+  public <V extends TType> QuantizedMul<V> quantizedMul(Operand<? extends TType> x,
+      Operand<? extends TType> y, Operand<TFloat32> minX, Operand<TFloat32> maxX,
       Operand<TFloat32> minY, Operand<TFloat32> maxY, Class<V> Toutput) {
     return QuantizedMul.create(scope, x, y, minX, maxX, minY, maxY, Toutput);
   }
@@ -1678,7 +1677,7 @@ public <V extends TType, T extends TType, U extends TType> QuantizedMul<V> quant
    * @param input
    * @return a new instance of Real
    */
-  public <T extends TType> Real<TFloat32> real(Operand<T> input) {
+  public Real<TFloat32> real(Operand<? extends TType> input) {
     return Real.create(scope, input);
   }
 
@@ -1701,7 +1700,7 @@ public <T extends TType> Real<TFloat32> real(Operand<T> input) {
    * @param Tout
    * @return a new instance of Real
    */
-  public <U extends TNumber, T extends TType> Real<U> real(Operand<T> input, Class<U> Tout) {
+  public <U extends TNumber> Real<U> real(Operand<? extends TType> input, Class<U> Tout) {
     return Real.create(scope, input, Tout);
   }
 
@@ -1813,8 +1812,8 @@ public <T extends TType> Rsqrt<T> rsqrt(Operand<T> x) {
    *  first dimension.  Values should be sorted and can be repeated.
    * @return a new instance of SegmentMax
    */
-  public <T extends TNumber, U extends TNumber> SegmentMax<T> segmentMax(Operand<T> data,
-      Operand<U> segmentIds) {
+  public <T extends TNumber> SegmentMax<T> segmentMax(Operand<T> data,
+      Operand<? extends TNumber> segmentIds) {
     return SegmentMax.create(scope, data, segmentIds);
   }
 
@@ -1850,8 +1849,8 @@ public <T extends TNumber, U extends TNumber> SegmentMax<T> segmentMax(Operand<T
    *  first dimension.  Values should be sorted and can be repeated.
    * @return a new instance of SegmentMean
    */
-  public <T extends TType, U extends TNumber> SegmentMean<T> segmentMean(Operand<T> data,
-      Operand<U> segmentIds) {
+  public <T extends TType> SegmentMean<T> segmentMean(Operand<T> data,
+      Operand<? extends TNumber> segmentIds) {
     return SegmentMean.create(scope, data, segmentIds);
   }
 
@@ -1886,8 +1885,8 @@ public <T extends TType, U extends TNumber> SegmentMean<T> segmentMean(Operand<T
    *  first dimension.  Values should be sorted and can be repeated.
    * @return a new instance of SegmentMin
    */
-  public <T extends TNumber, U extends TNumber> SegmentMin<T> segmentMin(Operand<T> data,
-      Operand<U> segmentIds) {
+  public <T extends TNumber> SegmentMin<T> segmentMin(Operand<T> data,
+      Operand<? extends TNumber> segmentIds) {
     return SegmentMin.create(scope, data, segmentIds);
   }
 
@@ -1922,8 +1921,8 @@ public <T extends TNumber, U extends TNumber> SegmentMin<T> segmentMin(Operand<T
    *  first dimension.  Values should be sorted and can be repeated.
    * @return a new instance of SegmentProd
    */
-  public <T extends TType, U extends TNumber> SegmentProd<T> segmentProd(Operand<T> data,
-      Operand<U> segmentIds) {
+  public <T extends TType> SegmentProd<T> segmentProd(Operand<T> data,
+      Operand<? extends TNumber> segmentIds) {
     return SegmentProd.create(scope, data, segmentIds);
   }
 
@@ -1958,8 +1957,8 @@ public <T extends TType, U extends TNumber> SegmentProd<T> segmentProd(Operand<T
    *  first dimension.  Values should be sorted and can be repeated.
    * @return a new instance of SegmentSum
    */
-  public <T extends TType, U extends TNumber> SegmentSum<T> segmentSum(Operand<T> data,
-      Operand<U> segmentIds) {
+  public <T extends TType> SegmentSum<T> segmentSum(Operand<T> data,
+      Operand<? extends TNumber> segmentIds) {
     return SegmentSum.create(scope, data, segmentIds);
   }
 
@@ -2220,8 +2219,8 @@ public <T extends TNumber> TruncateMod<T> truncateMod(Operand<T> x, Operand<T> y
    * @param numSegments
    * @return a new instance of UnsortedSegmentMax
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber> UnsortedSegmentMax<T> unsortedSegmentMax(
-      Operand<T> data, Operand<U> segmentIds, Operand<V> numSegments) {
+  public <T extends TNumber> UnsortedSegmentMax<T> unsortedSegmentMax(Operand<T> data,
+      Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     return UnsortedSegmentMax.create(scope, data, segmentIds, numSegments);
   }
 
@@ -2259,8 +2258,8 @@ public <T extends TNumber, U extends TNumber, V extends TNumber> UnsortedSegment
    * @param numSegments
    * @return a new instance of UnsortedSegmentMin
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber> UnsortedSegmentMin<T> unsortedSegmentMin(
-      Operand<T> data, Operand<U> segmentIds, Operand<V> numSegments) {
+  public <T extends TNumber> UnsortedSegmentMin<T> unsortedSegmentMin(Operand<T> data,
+      Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     return UnsortedSegmentMin.create(scope, data, segmentIds, numSegments);
   }
 
@@ -2297,8 +2296,8 @@ public <T extends TNumber, U extends TNumber, V extends TNumber> UnsortedSegment
    * @param numSegments
    * @return a new instance of UnsortedSegmentProd
    */
-  public <T extends TType, U extends TNumber, V extends TNumber> UnsortedSegmentProd<T> unsortedSegmentProd(
-      Operand<T> data, Operand<U> segmentIds, Operand<V> numSegments) {
+  public <T extends TType> UnsortedSegmentProd<T> unsortedSegmentProd(Operand<T> data,
+      Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     return UnsortedSegmentProd.create(scope, data, segmentIds, numSegments);
   }
 
@@ -2337,8 +2336,8 @@ public <T extends TType, U extends TNumber, V extends TNumber> UnsortedSegmentPr
    * @param numSegments
    * @return a new instance of UnsortedSegmentSum
    */
-  public <T extends TType, U extends TNumber, V extends TNumber> UnsortedSegmentSum<T> unsortedSegmentSum(
-      Operand<T> data, Operand<U> segmentIds, Operand<V> numSegments) {
+  public <T extends TType> UnsortedSegmentSum<T> unsortedSegmentSum(Operand<T> data,
+      Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     return UnsortedSegmentSum.create(scope, data, segmentIds, numSegments);
   }
 
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 8b5b01fac32..5ec7f93020f 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
@@ -434,9 +434,9 @@ public <T extends TNumber> Conv3dBackpropFilter<T> conv3dBackpropFilter(Operand<
    * @param options carries optional attributes values
    * @return a new instance of Conv3dBackpropInput
    */
-  public <U extends TNumber, T extends TNumber> Conv3dBackpropInput<U> conv3dBackpropInput(
-      Operand<T> inputSizes, Operand<U> filter, Operand<U> outBackprop, List<Long> strides,
-      String padding, Conv3dBackpropInput.Options... options) {
+  public <U extends TNumber> Conv3dBackpropInput<U> conv3dBackpropInput(
+      Operand<? extends TNumber> inputSizes, Operand<U> filter, Operand<U> outBackprop,
+      List<Long> strides, String padding, Conv3dBackpropInput.Options... options) {
     return Conv3dBackpropInput.create(scope, inputSizes, filter, outBackprop, strides, padding, options);
   }
 
@@ -1444,9 +1444,9 @@ public <T extends TNumber> MaxPoolGradGrad<T> maxPoolGradGrad(Operand<T> origInp
    * @param options carries optional attributes values
    * @return a new instance of MaxPoolGradGradWithArgmax
    */
-  public <T extends TNumber, U extends TNumber> MaxPoolGradGradWithArgmax<T> maxPoolGradGradWithArgmax(
-      Operand<T> input, Operand<T> grad, Operand<U> argmax, List<Long> ksize, List<Long> strides,
-      String padding, MaxPoolGradGradWithArgmax.Options... options) {
+  public <T extends TNumber> MaxPoolGradGradWithArgmax<T> maxPoolGradGradWithArgmax(
+      Operand<T> input, Operand<T> grad, Operand<? extends TNumber> argmax, List<Long> ksize,
+      List<Long> strides, String padding, MaxPoolGradGradWithArgmax.Options... options) {
     return MaxPoolGradGradWithArgmax.create(scope, input, grad, argmax, ksize, strides, padding, options);
   }
 
@@ -1610,8 +1610,8 @@ public <U extends TType, T extends TType> QuantizedBatchNormWithGlobalNormalizat
    * @param outType
    * @return a new instance of QuantizedBiasAdd
    */
-  public <V extends TType, T extends TType, U extends TType> QuantizedBiasAdd<V> quantizedBiasAdd(
-      Operand<T> input, Operand<U> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput,
+  public <V extends TType> QuantizedBiasAdd<V> quantizedBiasAdd(Operand<? extends TType> input,
+      Operand<? extends TType> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput,
       Operand<TFloat32> minBias, Operand<TFloat32> maxBias, Class<V> outType) {
     return QuantizedBiasAdd.create(scope, input, bias, minInput, maxInput, minBias, maxBias, outType);
   }
@@ -1638,8 +1638,8 @@ public <V extends TType, T extends TType, U extends TType> QuantizedBiasAdd<V> q
    * @param options carries optional attributes values
    * @return a new instance of QuantizedConv2d
    */
-  public <V extends TType, T extends TType, U extends TType> QuantizedConv2d<V> quantizedConv2d(
-      Operand<T> input, Operand<U> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput,
+  public <V extends TType> QuantizedConv2d<V> quantizedConv2d(Operand<? extends TType> input,
+      Operand<? extends TType> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput,
       Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType,
       List<Long> strides, String padding, QuantizedConv2d.Options... options) {
     return QuantizedConv2d.create(scope, input, filter, minInput, maxInput, minFilter, maxFilter, outType, strides, padding, options);
@@ -1690,7 +1690,7 @@ public <T extends TType> QuantizedMaxPool<T> quantizedMaxPool(Operand<T> input,
    * @param outType
    * @return a new instance of QuantizedRelu
    */
-  public <U extends TType, T extends TType> QuantizedRelu<U> quantizedRelu(Operand<T> features,
+  public <U extends TType> QuantizedRelu<U> quantizedRelu(Operand<? extends TType> features,
       Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
     return QuantizedRelu.create(scope, features, minFeatures, maxFeatures, outType);
   }
@@ -1705,7 +1705,7 @@ public <U extends TType, T extends TType> QuantizedRelu<U> quantizedRelu(Operand
    * @param outType
    * @return a new instance of QuantizedRelu6
    */
-  public <U extends TType, T extends TType> QuantizedRelu6<U> quantizedRelu6(Operand<T> features,
+  public <U extends TType> QuantizedRelu6<U> quantizedRelu6(Operand<? extends TType> features,
       Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
     return QuantizedRelu6.create(scope, features, minFeatures, maxFeatures, outType);
   }
@@ -1721,7 +1721,7 @@ public <U extends TType, T extends TType> QuantizedRelu6<U> quantizedRelu6(Opera
    * @param outType
    * @return a new instance of QuantizedReluX
    */
-  public <U extends TType, T extends TType> QuantizedReluX<U> quantizedReluX(Operand<T> features,
+  public <U extends TType> QuantizedReluX<U> quantizedReluX(Operand<? extends TType> features,
       Operand<TFloat32> maxValue, Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures,
       Class<U> outType) {
     return QuantizedReluX.create(scope, features, maxValue, minFeatures, maxFeatures, outType);
@@ -1985,8 +1985,8 @@ public <T extends TNumber> Softsign<T> softsign(Operand<T> features) {
    * @param blockSize
    * @return a new instance of SpaceToBatch
    */
-  public <T extends TType, U extends TNumber> SpaceToBatch<T> spaceToBatch(Operand<T> input,
-      Operand<U> paddings, Long blockSize) {
+  public <T extends TType> SpaceToBatch<T> spaceToBatch(Operand<T> input,
+      Operand<? extends TNumber> paddings, Long blockSize) {
     return SpaceToBatch.create(scope, input, paddings, blockSize);
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/NnRawOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/NnRawOps.java
index 64cecadbe6d..13c6baa651a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/NnRawOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/NnRawOps.java
@@ -70,8 +70,8 @@ public <T extends TNumber> SoftmaxCrossEntropyWithLogits<T> softmaxCrossEntropyW
    *  This is the label for the given minibatch entry.
    * @return a new instance of SparseSoftmaxCrossEntropyWithLogits
    */
-  public <T extends TNumber, U extends TNumber> SparseSoftmaxCrossEntropyWithLogits<T> sparseSoftmaxCrossEntropyWithLogits(
-      Operand<T> features, Operand<U> labels) {
+  public <T extends TNumber> SparseSoftmaxCrossEntropyWithLogits<T> sparseSoftmaxCrossEntropyWithLogits(
+      Operand<T> features, Operand<? extends TNumber> labels) {
     return SparseSoftmaxCrossEntropyWithLogits.create(scope, features, labels);
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java
index 23ca3497412..810acfcbc25 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java
@@ -243,8 +243,6 @@
 import org.tensorflow.op.core.TensorListSetItem;
 import org.tensorflow.op.core.TensorListSplit;
 import org.tensorflow.op.core.TensorListStack;
-import org.tensorflow.op.core.TensorScatterMax;
-import org.tensorflow.op.core.TensorScatterMin;
 import org.tensorflow.op.core.TensorScatterNdAdd;
 import org.tensorflow.op.core.TensorScatterNdMax;
 import org.tensorflow.op.core.TensorScatterNdMin;
@@ -405,8 +403,7 @@ public Abort abort(Abort.Options... options) {
    * @param options carries optional attributes values
    * @return a new instance of All
    */
-  public <T extends TNumber> All all(Operand<TBool> input, Operand<T> axis,
-      All.Options... options) {
+  public All all(Operand<TBool> input, Operand<? extends TNumber> axis, All.Options... options) {
     return All.create(scope, input, axis, options);
   }
 
@@ -424,8 +421,7 @@ public <T extends TNumber> All all(Operand<TBool> input, Operand<T> axis,
    * @param options carries optional attributes values
    * @return a new instance of Any
    */
-  public <T extends TNumber> Any any(Operand<TBool> input, Operand<T> axis,
-      Any.Options... options) {
+  public Any any(Operand<TBool> input, Operand<? extends TNumber> axis, Any.Options... options) {
     return Any.create(scope, input, axis, options);
   }
 
@@ -579,8 +575,8 @@ public <T extends TType> AssignAdd<T> assignAdd(Operand<T> ref, Operand<T> value
    * @param value the value by which the variable will be incremented.
    * @return a new instance of AssignAddVariableOp
    */
-  public <T extends TType> AssignAddVariableOp assignAddVariableOp(Operand<?> resource,
-      Operand<T> value) {
+  public AssignAddVariableOp assignAddVariableOp(Operand<?> resource,
+      Operand<? extends TType> value) {
     return AssignAddVariableOp.create(scope, resource, value);
   }
 
@@ -611,8 +607,8 @@ public <T extends TType> AssignSub<T> assignSub(Operand<T> ref, Operand<T> value
    * @param value the value by which the variable will be incremented.
    * @return a new instance of AssignSubVariableOp
    */
-  public <T extends TType> AssignSubVariableOp assignSubVariableOp(Operand<?> resource,
-      Operand<T> value) {
+  public AssignSubVariableOp assignSubVariableOp(Operand<?> resource,
+      Operand<? extends TType> value) {
     return AssignSubVariableOp.create(scope, resource, value);
   }
 
@@ -626,8 +622,7 @@ public <T extends TType> AssignSubVariableOp assignSubVariableOp(Operand<?> reso
    * @param value the value to set the new tensor to use.
    * @return a new instance of AssignVariableOp
    */
-  public <T extends TType> AssignVariableOp assignVariableOp(Operand<?> resource,
-      Operand<T> value) {
+  public AssignVariableOp assignVariableOp(Operand<?> resource, Operand<? extends TType> value) {
     return AssignVariableOp.create(scope, resource, value);
   }
 
@@ -694,8 +689,8 @@ public BarrierIncompleteSize barrierIncompleteSize(Operand<TString> handle) {
    * @param componentIndex The component of the barrier elements that is being assigned.
    * @return a new instance of BarrierInsertMany
    */
-  public <T extends TType> BarrierInsertMany barrierInsertMany(Operand<TString> handle,
-      Operand<TString> keys, Operand<T> values, Long componentIndex) {
+  public BarrierInsertMany barrierInsertMany(Operand<TString> handle, Operand<TString> keys,
+      Operand<? extends TType> values, Long componentIndex) {
     return BarrierInsertMany.create(scope, handle, keys, values, componentIndex);
   }
 
@@ -809,8 +804,8 @@ public Batch batch(Iterable<Operand<?>> inTensors, Long numBatchThreads, Long ma
    * @param blockSize
    * @return a new instance of BatchToSpace
    */
-  public <T extends TType, U extends TNumber> BatchToSpace<T> batchToSpace(Operand<T> input,
-      Operand<U> crops, Long blockSize) {
+  public <T extends TType> BatchToSpace<T> batchToSpace(Operand<T> input,
+      Operand<? extends TNumber> crops, Long blockSize) {
     return BatchToSpace.create(scope, input, crops, blockSize);
   }
 
@@ -924,8 +919,8 @@ public <T extends TType, U extends TNumber> BatchToSpace<T> batchToSpace(Operand
    *  }</pre>
    * @return a new instance of BatchToSpaceNd
    */
-  public <T extends TType, U extends TNumber, V extends TNumber> BatchToSpaceNd<T> batchToSpaceNd(
-      Operand<T> input, Operand<U> blockShape, Operand<V> crops) {
+  public <T extends TType> BatchToSpaceNd<T> batchToSpaceNd(Operand<T> input,
+      Operand<? extends TNumber> blockShape, Operand<? extends TNumber> crops) {
     return BatchToSpaceNd.create(scope, input, blockShape, crops);
   }
 
@@ -988,7 +983,7 @@ public <T extends TType, U extends TNumber, V extends TNumber> BatchToSpaceNd<T>
    * @param type
    * @return a new instance of Bitcast
    */
-  public <U extends TType, T extends TType> Bitcast<U> bitcast(Operand<T> input, Class<U> type) {
+  public <U extends TType> Bitcast<U> bitcast(Operand<? extends TType> input, Class<U> type) {
     return Bitcast.create(scope, input, type);
   }
 
@@ -1044,8 +1039,8 @@ public <T extends TNumber> BroadcastDynamicShape<T> broadcastDynamicShape(Operan
    * @param shape An 1-D `int` Tensor. The shape of the desired output.
    * @return a new instance of BroadcastTo
    */
-  public <T extends TType, U extends TNumber> BroadcastTo<T> broadcastTo(Operand<T> input,
-      Operand<U> shape) {
+  public <T extends TType> BroadcastTo<T> broadcastTo(Operand<T> input,
+      Operand<? extends TNumber> shape) {
     return BroadcastTo.create(scope, input, shape);
   }
 
@@ -1067,7 +1062,7 @@ public <T extends TType, U extends TNumber> BroadcastTo<T> broadcastTo(Operand<T
    * @param boundaries A sorted list of floats gives the boundary of the buckets.
    * @return a new instance of Bucketize
    */
-  public <T extends TNumber> Bucketize bucketize(Operand<T> input, List<Float> boundaries) {
+  public Bucketize bucketize(Operand<? extends TNumber> input, List<Float> boundaries) {
     return Bucketize.create(scope, input, boundaries);
   }
 
@@ -1102,8 +1097,8 @@ public <T extends TType> ClipByValue<T> clipByValue(Operand<T> t, Operand<T> cli
    *  range [-rank(values), rank(values)).
    * @return a new instance of Concat
    */
-  public <T extends TType, U extends TNumber> Concat<T> concat(Iterable<Operand<T>> values,
-      Operand<U> axis) {
+  public <T extends TType> Concat<T> concat(Iterable<Operand<T>> values,
+      Operand<? extends TNumber> axis) {
     return Concat.create(scope, values, axis);
   }
 
@@ -2158,8 +2153,8 @@ public <T extends TType> Empty<T> empty(Operand<TInt32> shape, Class<T> dtype,
    * @param elementDtype
    * @return a new instance of EmptyTensorList
    */
-  public <T extends TNumber, U extends TType> EmptyTensorList emptyTensorList(
-      Operand<T> elementShape, Operand<TInt32> maxNumElements, Class<U> elementDtype) {
+  public <U extends TType> EmptyTensorList emptyTensorList(Operand<? extends TNumber> elementShape,
+      Operand<TInt32> maxNumElements, Class<U> elementDtype) {
     return EmptyTensorList.create(scope, elementShape, maxNumElements, elementDtype);
   }
 
@@ -2217,8 +2212,8 @@ public <T extends TType> EnsureShape<T> ensureShape(Operand<T> input, Shape shap
    *  `[-rank(input) - 1, rank(input)]`.
    * @return a new instance of ExpandDims
    */
-  public <T extends TType, U extends TNumber> ExpandDims<T> expandDims(Operand<T> input,
-      Operand<U> axis) {
+  public <T extends TType> ExpandDims<T> expandDims(Operand<T> input,
+      Operand<? extends TNumber> axis) {
     return ExpandDims.create(scope, input, axis);
   }
 
@@ -2278,7 +2273,7 @@ public <T extends TNumber> ExtractVolumePatches<T> extractVolumePatches(Operand<
    * @end_compatibility
    * @return a new instance of Fill
    */
-  public <U extends TType, T extends TNumber> Fill<U> fill(Operand<T> dims, Operand<U> value) {
+  public <U extends TType> Fill<U> fill(Operand<? extends TNumber> dims, Operand<U> value) {
     return Fill.create(scope, dims, value);
   }
 
@@ -2319,7 +2314,7 @@ public <U extends TType, T extends TNumber> Fill<U> fill(Operand<T> dims, Operan
    *  `farmhash::fingerprint64`.
    * @return a new instance of Fingerprint
    */
-  public <T extends TType> Fingerprint fingerprint(Operand<T> data, Operand<TString> method) {
+  public Fingerprint fingerprint(Operand<? extends TType> data, Operand<TString> method) {
     return Fingerprint.create(scope, data, method);
   }
 
@@ -2361,8 +2356,8 @@ public <T extends TType> Fingerprint fingerprint(Operand<T> data, Operand<TStrin
    * @param options carries optional attributes values
    * @return a new instance of Gather
    */
-  public <T extends TType, U extends TNumber, V extends TNumber> Gather<T> gather(Operand<T> params,
-      Operand<U> indices, Operand<V> axis, Gather.Options... options) {
+  public <T extends TType> Gather<T> gather(Operand<T> params, Operand<? extends TNumber> indices,
+      Operand<? extends TNumber> axis, Gather.Options... options) {
     return Gather.create(scope, params, indices, axis, options);
   }
 
@@ -2467,8 +2462,8 @@ public <T extends TType, U extends TNumber, V extends TNumber> Gather<T> gather(
    * @param indices Index tensor.
    * @return a new instance of GatherNd
    */
-  public <T extends TType, U extends TNumber> GatherNd<T> gatherNd(Operand<T> params,
-      Operand<U> indices) {
+  public <T extends TType> GatherNd<T> gatherNd(Operand<T> params,
+      Operand<? extends TNumber> indices) {
     return GatherNd.create(scope, params, indices);
   }
 
@@ -2478,7 +2473,7 @@ public <T extends TType, U extends TNumber> GatherNd<T> gatherNd(Operand<T> para
    * @param value The tensor to be stored.
    * @return a new instance of GetSessionHandle
    */
-  public <T extends TType> GetSessionHandle getSessionHandle(Operand<T> value) {
+  public GetSessionHandle getSessionHandle(Operand<? extends TType> value) {
     return GetSessionHandle.create(scope, value);
   }
 
@@ -2774,8 +2769,8 @@ public void initAdd(Op initializer) {
    * @param values Values of type Tval.
    * @return a new instance of InitializeTable
    */
-  public <T extends TType, U extends TType> InitializeTable initializeTable(Operand<?> tableHandle,
-      Operand<T> keys, Operand<U> values) {
+  public InitializeTable initializeTable(Operand<?> tableHandle, Operand<? extends TType> keys,
+      Operand<? extends TType> values) {
     return InitializeTable.create(scope, tableHandle, keys, values);
   }
 
@@ -2864,7 +2859,7 @@ public <T extends TType> InplaceUpdate<T> inplaceUpdate(Operand<T> x, Operand<TI
    * @param ref Should be from a `Variable` node. May be uninitialized.
    * @return a new instance of IsVariableInitialized
    */
-  public <T extends TType> IsVariableInitialized isVariableInitialized(Operand<T> ref) {
+  public IsVariableInitialized isVariableInitialized(Operand<? extends TType> ref) {
     return IsVariableInitialized.create(scope, ref);
   }
 
@@ -2898,8 +2893,8 @@ public <T extends TType, U extends TType> LookupTableExport<T, U> lookupTableExp
    * @param defaultValue
    * @return a new instance of LookupTableFind
    */
-  public <U extends TType, T extends TType> LookupTableFind<U> lookupTableFind(
-      Operand<?> tableHandle, Operand<T> keys, Operand<U> defaultValue) {
+  public <U extends TType> LookupTableFind<U> lookupTableFind(Operand<?> tableHandle,
+      Operand<? extends TType> keys, Operand<U> defaultValue) {
     return LookupTableFind.create(scope, tableHandle, keys, defaultValue);
   }
 
@@ -2914,8 +2909,8 @@ public <U extends TType, T extends TType> LookupTableFind<U> lookupTableFind(
    * @param values Values to associate with keys.
    * @return a new instance of LookupTableImport
    */
-  public <T extends TType, U extends TType> LookupTableImport lookupTableImport(
-      Operand<?> tableHandle, Operand<T> keys, Operand<U> values) {
+  public LookupTableImport lookupTableImport(Operand<?> tableHandle, Operand<? extends TType> keys,
+      Operand<? extends TType> values) {
     return LookupTableImport.create(scope, tableHandle, keys, values);
   }
 
@@ -2930,8 +2925,8 @@ public <T extends TType, U extends TType> LookupTableImport lookupTableImport(
    * @param values Values to associate with keys.
    * @return a new instance of LookupTableInsert
    */
-  public <T extends TType, U extends TType> LookupTableInsert lookupTableInsert(
-      Operand<?> tableHandle, Operand<T> keys, Operand<U> values) {
+  public LookupTableInsert lookupTableInsert(Operand<?> tableHandle, Operand<? extends TType> keys,
+      Operand<? extends TType> values) {
     return LookupTableInsert.create(scope, tableHandle, keys, values);
   }
 
@@ -3074,7 +3069,7 @@ public MapUnstageNoKey mapUnstageNoKey(Operand<TInt32> indices,
    * @param options carries optional attributes values
    * @return a new instance of Max
    */
-  public <T extends TType, U extends TNumber> Max<T> max(Operand<T> input, Operand<U> axis,
+  public <T extends TType> Max<T> max(Operand<T> input, Operand<? extends TNumber> axis,
       Max.Options... options) {
     return Max.create(scope, input, axis, options);
   }
@@ -3111,7 +3106,7 @@ public <T extends TType> Merge<T> merge(Iterable<Operand<T>> inputs) {
    * @param options carries optional attributes values
    * @return a new instance of Min
    */
-  public <T extends TType, U extends TNumber> Min<T> min(Operand<T> input, Operand<U> axis,
+  public <T extends TType> Min<T> min(Operand<T> input, Operand<? extends TNumber> axis,
       Min.Options... options) {
     return Min.create(scope, input, axis, options);
   }
@@ -3155,8 +3150,8 @@ public <T extends TType, U extends TNumber> Min<T> min(Operand<T> input, Operand
    *  it is `[1, 2, 3, 3, 2]` in symmetric mode.
    * @return a new instance of MirrorPad
    */
-  public <T extends TType, U extends TNumber> MirrorPad<T> mirrorPad(Operand<T> input,
-      Operand<U> paddings, String mode) {
+  public <T extends TType> MirrorPad<T> mirrorPad(Operand<T> input,
+      Operand<? extends TNumber> paddings, String mode) {
     return MirrorPad.create(scope, input, paddings, mode);
   }
 
@@ -3424,7 +3419,7 @@ public NoOp noOp() {
    * @param options carries optional attributes values
    * @return a new instance of OneHot
    */
-  public <U extends TType, T extends TNumber> OneHot<U> oneHot(Operand<T> indices,
+  public <U extends TType> OneHot<U> oneHot(Operand<? extends TNumber> indices,
       Operand<TInt32> depth, Operand<U> onValue, Operand<U> offValue, OneHot.Options... options) {
     return OneHot.create(scope, indices, depth, onValue, offValue, options);
   }
@@ -3592,7 +3587,7 @@ public OrderedMapUnstageNoKey orderedMapUnstageNoKey(Operand<TInt32> indices,
    * @param constantValues
    * @return a new instance of Pad
    */
-  public <T extends TType, U extends TNumber> Pad<T> pad(Operand<T> input, Operand<U> paddings,
+  public <T extends TType> Pad<T> pad(Operand<T> input, Operand<? extends TNumber> paddings,
       Operand<T> constantValues) {
     return Pad.create(scope, input, paddings, constantValues);
   }
@@ -3752,7 +3747,7 @@ public Print print(Operand<TString> input, Print.Options... options) {
    * @param options carries optional attributes values
    * @return a new instance of Prod
    */
-  public <T extends TType, U extends TNumber> Prod<T> prod(Operand<T> input, Operand<U> axis,
+  public <T extends TType> Prod<T> prod(Operand<T> input, Operand<? extends TNumber> axis,
       Prod.Options... options) {
     return Prod.create(scope, input, axis, options);
   }
@@ -3769,8 +3764,8 @@ public <T extends TType, U extends TNumber> Prod<T> prod(Operand<T> input, Opera
    * @param inputMax The maximum value of the input.
    * @return a new instance of QuantizedReshape
    */
-  public <T extends TType, U extends TNumber> QuantizedReshape<T> quantizedReshape(
-      Operand<T> tensor, Operand<U> shape, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
+  public <T extends TType> QuantizedReshape<T> quantizedReshape(Operand<T> tensor,
+      Operand<? extends TNumber> shape, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
     return QuantizedReshape.create(scope, tensor, shape, inputMin, inputMax);
   }
 
@@ -3816,7 +3811,7 @@ public <T extends TNumber> Range<T> range(Operand<T> start, Operand<T> limit, Op
    * @param input
    * @return a new instance of Rank
    */
-  public <T extends TType> Rank rank(Operand<T> input) {
+  public Rank rank(Operand<? extends TType> input) {
     return Rank.create(scope, input);
   }
 
@@ -3853,7 +3848,7 @@ public <T extends TType> ReadVariableOp<T> readVariableOp(Operand<?> resource, C
    * @param options carries optional attributes values
    * @return a new instance of ReduceAll
    */
-  public <T extends TNumber> ReduceAll reduceAll(Operand<TBool> input, Operand<T> axis,
+  public ReduceAll reduceAll(Operand<TBool> input, Operand<? extends TNumber> axis,
       ReduceAll.Options... options) {
     return ReduceAll.create(scope, input, axis, options);
   }
@@ -3872,7 +3867,7 @@ public <T extends TNumber> ReduceAll reduceAll(Operand<TBool> input, Operand<T>
    * @param options carries optional attributes values
    * @return a new instance of ReduceAny
    */
-  public <T extends TNumber> ReduceAny reduceAny(Operand<TBool> input, Operand<T> axis,
+  public ReduceAny reduceAny(Operand<TBool> input, Operand<? extends TNumber> axis,
       ReduceAny.Options... options) {
     return ReduceAny.create(scope, input, axis, options);
   }
@@ -3892,8 +3887,8 @@ public <T extends TNumber> ReduceAny reduceAny(Operand<TBool> input, Operand<T>
    * @param options carries optional attributes values
    * @return a new instance of ReduceMax
    */
-  public <T extends TType, U extends TNumber> ReduceMax<T> reduceMax(Operand<T> input,
-      Operand<U> axis, ReduceMax.Options... options) {
+  public <T extends TType> ReduceMax<T> reduceMax(Operand<T> input, Operand<? extends TNumber> axis,
+      ReduceMax.Options... options) {
     return ReduceMax.create(scope, input, axis, options);
   }
 
@@ -3912,8 +3907,8 @@ public <T extends TType, U extends TNumber> ReduceMax<T> reduceMax(Operand<T> in
    * @param options carries optional attributes values
    * @return a new instance of ReduceMin
    */
-  public <T extends TType, U extends TNumber> ReduceMin<T> reduceMin(Operand<T> input,
-      Operand<U> axis, ReduceMin.Options... options) {
+  public <T extends TType> ReduceMin<T> reduceMin(Operand<T> input, Operand<? extends TNumber> axis,
+      ReduceMin.Options... options) {
     return ReduceMin.create(scope, input, axis, options);
   }
 
@@ -3932,8 +3927,8 @@ public <T extends TType, U extends TNumber> ReduceMin<T> reduceMin(Operand<T> in
    * @param options carries optional attributes values
    * @return a new instance of ReduceProd
    */
-  public <T extends TType, U extends TNumber> ReduceProd<T> reduceProd(Operand<T> input,
-      Operand<U> axis, ReduceProd.Options... options) {
+  public <T extends TType> ReduceProd<T> reduceProd(Operand<T> input,
+      Operand<? extends TNumber> axis, ReduceProd.Options... options) {
     return ReduceProd.create(scope, input, axis, options);
   }
 
@@ -3952,8 +3947,8 @@ public <T extends TType, U extends TNumber> ReduceProd<T> reduceProd(Operand<T>
    * @param options carries optional attributes values
    * @return a new instance of ReduceSum
    */
-  public <T extends TType, U extends TNumber> ReduceSum<T> reduceSum(Operand<T> input,
-      Operand<U> axis, ReduceSum.Options... options) {
+  public <T extends TType> ReduceSum<T> reduceSum(Operand<T> input, Operand<? extends TNumber> axis,
+      ReduceSum.Options... options) {
     return ReduceSum.create(scope, input, axis, options);
   }
 
@@ -4087,8 +4082,7 @@ public RemoteFusedGraphExecute remoteFusedGraphExecute(Iterable<Operand<?>> inpu
    * @param shape Defines the shape of the output tensor.
    * @return a new instance of Reshape
    */
-  public <T extends TType, U extends TNumber> Reshape<T> reshape(Operand<T> tensor,
-      Operand<U> shape) {
+  public <T extends TType> Reshape<T> reshape(Operand<T> tensor, Operand<? extends TNumber> shape) {
     return Reshape.create(scope, tensor, shape);
   }
 
@@ -4130,8 +4124,8 @@ public <T extends TNumber> ResourceCountUpTo<T> resourceCountUpTo(Operand<?> res
    * @param options carries optional attributes values
    * @return a new instance of ResourceGather
    */
-  public <U extends TType, T extends TNumber> ResourceGather<U> resourceGather(Operand<?> resource,
-      Operand<T> indices, Class<U> dtype, ResourceGather.Options... options) {
+  public <U extends TType> ResourceGather<U> resourceGather(Operand<?> resource,
+      Operand<? extends TNumber> indices, Class<U> dtype, ResourceGather.Options... options) {
     return ResourceGather.create(scope, resource, indices, dtype, options);
   }
 
@@ -4143,8 +4137,8 @@ public <U extends TType, T extends TNumber> ResourceGather<U> resourceGather(Ope
    * @param dtype
    * @return a new instance of ResourceGatherNd
    */
-  public <U extends TType, T extends TNumber> ResourceGatherNd<U> resourceGatherNd(
-      Operand<?> resource, Operand<T> indices, Class<U> dtype) {
+  public <U extends TType> ResourceGatherNd<U> resourceGatherNd(Operand<?> resource,
+      Operand<? extends TNumber> indices, Class<U> dtype) {
     return ResourceGatherNd.create(scope, resource, indices, dtype);
   }
 
@@ -4176,8 +4170,8 @@ public <U extends TType, T extends TNumber> ResourceGatherNd<U> resourceGatherNd
    * @param updates A tensor of updated values to add to `ref`.
    * @return a new instance of ResourceScatterAdd
    */
-  public <T extends TNumber, U extends TType> ResourceScatterAdd resourceScatterAdd(
-      Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public ResourceScatterAdd resourceScatterAdd(Operand<?> resource,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     return ResourceScatterAdd.create(scope, resource, indices, updates);
   }
 
@@ -4209,8 +4203,8 @@ public <T extends TNumber, U extends TType> ResourceScatterAdd resourceScatterAd
    * @param updates A tensor of updated values to add to `ref`.
    * @return a new instance of ResourceScatterDiv
    */
-  public <T extends TNumber, U extends TType> ResourceScatterDiv resourceScatterDiv(
-      Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public ResourceScatterDiv resourceScatterDiv(Operand<?> resource,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     return ResourceScatterDiv.create(scope, resource, indices, updates);
   }
 
@@ -4242,8 +4236,8 @@ public <T extends TNumber, U extends TType> ResourceScatterDiv resourceScatterDi
    * @param updates A tensor of updated values to add to `ref`.
    * @return a new instance of ResourceScatterMax
    */
-  public <T extends TNumber, U extends TType> ResourceScatterMax resourceScatterMax(
-      Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public ResourceScatterMax resourceScatterMax(Operand<?> resource,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     return ResourceScatterMax.create(scope, resource, indices, updates);
   }
 
@@ -4275,8 +4269,8 @@ public <T extends TNumber, U extends TType> ResourceScatterMax resourceScatterMa
    * @param updates A tensor of updated values to add to `ref`.
    * @return a new instance of ResourceScatterMin
    */
-  public <T extends TNumber, U extends TType> ResourceScatterMin resourceScatterMin(
-      Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public ResourceScatterMin resourceScatterMin(Operand<?> resource,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     return ResourceScatterMin.create(scope, resource, indices, updates);
   }
 
@@ -4308,8 +4302,8 @@ public <T extends TNumber, U extends TType> ResourceScatterMin resourceScatterMi
    * @param updates A tensor of updated values to add to `ref`.
    * @return a new instance of ResourceScatterMul
    */
-  public <T extends TNumber, U extends TType> ResourceScatterMul resourceScatterMul(
-      Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public ResourceScatterMul resourceScatterMul(Operand<?> resource,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     return ResourceScatterMul.create(scope, resource, indices, updates);
   }
 
@@ -4354,8 +4348,8 @@ public <T extends TNumber, U extends TType> ResourceScatterMul resourceScatterMu
    * @param options carries optional attributes values
    * @return a new instance of ResourceScatterNdAdd
    */
-  public <T extends TNumber, U extends TType> ResourceScatterNdAdd resourceScatterNdAdd(
-      Operand<?> ref, Operand<T> indices, Operand<U> updates,
+  public ResourceScatterNdAdd resourceScatterNdAdd(Operand<?> ref,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates,
       ResourceScatterNdAdd.Options... options) {
     return ResourceScatterNdAdd.create(scope, ref, indices, updates, options);
   }
@@ -4370,8 +4364,8 @@ public <T extends TNumber, U extends TType> ResourceScatterNdAdd resourceScatter
    * @param options carries optional attributes values
    * @return a new instance of ResourceScatterNdMax
    */
-  public <T extends TNumber, U extends TType> ResourceScatterNdMax resourceScatterNdMax(
-      Operand<?> ref, Operand<T> indices, Operand<U> updates,
+  public ResourceScatterNdMax resourceScatterNdMax(Operand<?> ref,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates,
       ResourceScatterNdMax.Options... options) {
     return ResourceScatterNdMax.create(scope, ref, indices, updates, options);
   }
@@ -4386,8 +4380,8 @@ public <T extends TNumber, U extends TType> ResourceScatterNdMax resourceScatter
    * @param options carries optional attributes values
    * @return a new instance of ResourceScatterNdMin
    */
-  public <T extends TNumber, U extends TType> ResourceScatterNdMin resourceScatterNdMin(
-      Operand<?> ref, Operand<T> indices, Operand<U> updates,
+  public ResourceScatterNdMin resourceScatterNdMin(Operand<?> ref,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates,
       ResourceScatterNdMin.Options... options) {
     return ResourceScatterNdMin.create(scope, ref, indices, updates, options);
   }
@@ -4433,8 +4427,8 @@ public <T extends TNumber, U extends TType> ResourceScatterNdMin resourceScatter
    * @param options carries optional attributes values
    * @return a new instance of ResourceScatterNdSub
    */
-  public <T extends TNumber, U extends TType> ResourceScatterNdSub resourceScatterNdSub(
-      Operand<?> ref, Operand<T> indices, Operand<U> updates,
+  public ResourceScatterNdSub resourceScatterNdSub(Operand<?> ref,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates,
       ResourceScatterNdSub.Options... options) {
     return ResourceScatterNdSub.create(scope, ref, indices, updates, options);
   }
@@ -4482,8 +4476,8 @@ public <T extends TNumber, U extends TType> ResourceScatterNdSub resourceScatter
    * @param options carries optional attributes values
    * @return a new instance of ResourceScatterNdUpdate
    */
-  public <T extends TNumber, U extends TType> ResourceScatterNdUpdate resourceScatterNdUpdate(
-      Operand<?> ref, Operand<T> indices, Operand<U> updates,
+  public ResourceScatterNdUpdate resourceScatterNdUpdate(Operand<?> ref,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates,
       ResourceScatterNdUpdate.Options... options) {
     return ResourceScatterNdUpdate.create(scope, ref, indices, updates, options);
   }
@@ -4516,8 +4510,8 @@ public <T extends TNumber, U extends TType> ResourceScatterNdUpdate resourceScat
    * @param updates A tensor of updated values to add to `ref`.
    * @return a new instance of ResourceScatterSub
    */
-  public <T extends TNumber, U extends TType> ResourceScatterSub resourceScatterSub(
-      Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public ResourceScatterSub resourceScatterSub(Operand<?> resource,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     return ResourceScatterSub.create(scope, resource, indices, updates);
   }
 
@@ -4540,8 +4534,8 @@ public <T extends TNumber, U extends TType> ResourceScatterSub resourceScatterSu
    * @param updates A tensor of updated values to add to `ref`.
    * @return a new instance of ResourceScatterUpdate
    */
-  public <T extends TNumber, U extends TType> ResourceScatterUpdate resourceScatterUpdate(
-      Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public ResourceScatterUpdate resourceScatterUpdate(Operand<?> resource,
+      Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     return ResourceScatterUpdate.create(scope, resource, indices, updates);
   }
 
@@ -4563,8 +4557,8 @@ public <T extends TNumber, U extends TType> ResourceScatterUpdate resourceScatte
    * @param options carries optional attributes values
    * @return a new instance of ResourceStridedSliceAssign
    */
-  public <T extends TNumber, U extends TType> ResourceStridedSliceAssign resourceStridedSliceAssign(
-      Operand<?> ref, Operand<T> begin, Operand<T> end, Operand<T> strides, Operand<U> value,
+  public <T extends TNumber> ResourceStridedSliceAssign resourceStridedSliceAssign(Operand<?> ref,
+      Operand<T> begin, Operand<T> end, Operand<T> strides, Operand<? extends TType> value,
       ResourceStridedSliceAssign.Options... options) {
     return ResourceStridedSliceAssign.create(scope, ref, begin, end, strides, value, options);
   }
@@ -4624,8 +4618,7 @@ public <T extends TNumber, U extends TType> ResourceStridedSliceAssign resourceS
    *  `[-rank(tensor), rank(tensor))`.
    * @return a new instance of Reverse
    */
-  public <T extends TType, U extends TNumber> Reverse<T> reverse(Operand<T> tensor,
-      Operand<U> axis) {
+  public <T extends TType> Reverse<T> reverse(Operand<T> tensor, Operand<? extends TNumber> axis) {
     return Reverse.create(scope, tensor, axis);
   }
 
@@ -4692,8 +4685,8 @@ public <T extends TType, U extends TNumber> Reverse<T> reverse(Operand<T> tensor
    * @param options carries optional attributes values
    * @return a new instance of ReverseSequence
    */
-  public <T extends TType, U extends TNumber> ReverseSequence<T> reverseSequence(Operand<T> input,
-      Operand<U> seqLengths, Long seqDim, ReverseSequence.Options... options) {
+  public <T extends TType> ReverseSequence<T> reverseSequence(Operand<T> input,
+      Operand<? extends TNumber> seqLengths, Long seqDim, ReverseSequence.Options... options) {
     return ReverseSequence.create(scope, input, seqLengths, seqDim, options);
   }
 
@@ -4732,8 +4725,8 @@ public <T extends TType, U extends TNumber> ReverseSequence<T> reverseSequence(O
    *  axis.
    * @return a new instance of Roll
    */
-  public <T extends TType, U extends TNumber, V extends TNumber> Roll<T> roll(Operand<T> input,
-      Operand<U> shift, Operand<V> axis) {
+  public <T extends TType> Roll<T> roll(Operand<T> input, Operand<? extends TNumber> shift,
+      Operand<? extends TNumber> axis) {
     return Roll.create(scope, input, shift, axis);
   }
 
@@ -4834,8 +4827,8 @@ public Rpc rpc(Operand<TString> address, Operand<TString> method, Operand<TStrin
    * @param options carries optional attributes values
    * @return a new instance of ScatterAdd
    */
-  public <T extends TType, U extends TNumber> ScatterAdd<T> scatterAdd(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterAdd.Options... options) {
+  public <T extends TType> ScatterAdd<T> scatterAdd(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterAdd.Options... options) {
     return ScatterAdd.create(scope, ref, indices, updates, options);
   }
 
@@ -4868,8 +4861,8 @@ public <T extends TType, U extends TNumber> ScatterAdd<T> scatterAdd(Operand<T>
    * @param options carries optional attributes values
    * @return a new instance of ScatterDiv
    */
-  public <T extends TType, U extends TNumber> ScatterDiv<T> scatterDiv(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterDiv.Options... options) {
+  public <T extends TType> ScatterDiv<T> scatterDiv(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterDiv.Options... options) {
     return ScatterDiv.create(scope, ref, indices, updates, options);
   }
 
@@ -4906,8 +4899,8 @@ public <T extends TType, U extends TNumber> ScatterDiv<T> scatterDiv(Operand<T>
    * @param options carries optional attributes values
    * @return a new instance of ScatterMax
    */
-  public <T extends TNumber, U extends TNumber> ScatterMax<T> scatterMax(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterMax.Options... options) {
+  public <T extends TNumber> ScatterMax<T> scatterMax(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterMax.Options... options) {
     return ScatterMax.create(scope, ref, indices, updates, options);
   }
 
@@ -4944,8 +4937,8 @@ public <T extends TNumber, U extends TNumber> ScatterMax<T> scatterMax(Operand<T
    * @param options carries optional attributes values
    * @return a new instance of ScatterMin
    */
-  public <T extends TNumber, U extends TNumber> ScatterMin<T> scatterMin(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterMin.Options... options) {
+  public <T extends TNumber> ScatterMin<T> scatterMin(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterMin.Options... options) {
     return ScatterMin.create(scope, ref, indices, updates, options);
   }
 
@@ -4978,8 +4971,8 @@ public <T extends TNumber, U extends TNumber> ScatterMin<T> scatterMin(Operand<T
    * @param options carries optional attributes values
    * @return a new instance of ScatterMul
    */
-  public <T extends TType, U extends TNumber> ScatterMul<T> scatterMul(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterMul.Options... options) {
+  public <T extends TType> ScatterMul<T> scatterMul(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterMul.Options... options) {
     return ScatterMul.create(scope, ref, indices, updates, options);
   }
 
@@ -5116,8 +5109,8 @@ public <U extends TType, T extends TNumber> ScatterNd<U> scatterNd(Operand<T> in
    * @param options carries optional attributes values
    * @return a new instance of ScatterNdAdd
    */
-  public <T extends TType, U extends TNumber> ScatterNdAdd<T> scatterNdAdd(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterNdAdd.Options... options) {
+  public <T extends TType> ScatterNdAdd<T> scatterNdAdd(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterNdAdd.Options... options) {
     return ScatterNdAdd.create(scope, ref, indices, updates, options);
   }
 
@@ -5166,8 +5159,8 @@ public <T extends TType, U extends TNumber> ScatterNdAdd<T> scatterNdAdd(Operand
    *  to add to `input`.
    * @return a new instance of ScatterNdNonAliasingAdd
    */
-  public <T extends TType, U extends TNumber> ScatterNdNonAliasingAdd<T> scatterNdNonAliasingAdd(
-      Operand<T> input, Operand<U> indices, Operand<T> updates) {
+  public <T extends TType> ScatterNdNonAliasingAdd<T> scatterNdNonAliasingAdd(Operand<T> input,
+      Operand<? extends TNumber> indices, Operand<T> updates) {
     return ScatterNdNonAliasingAdd.create(scope, input, indices, updates);
   }
 
@@ -5215,8 +5208,8 @@ public <T extends TType, U extends TNumber> ScatterNdNonAliasingAdd<T> scatterNd
    * @param options carries optional attributes values
    * @return a new instance of ScatterNdSub
    */
-  public <T extends TType, U extends TNumber> ScatterNdSub<T> scatterNdSub(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterNdSub.Options... options) {
+  public <T extends TType> ScatterNdSub<T> scatterNdSub(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterNdSub.Options... options) {
     return ScatterNdSub.create(scope, ref, indices, updates, options);
   }
 
@@ -5266,8 +5259,8 @@ public <T extends TType, U extends TNumber> ScatterNdSub<T> scatterNdSub(Operand
    * @param options carries optional attributes values
    * @return a new instance of ScatterNdUpdate
    */
-  public <T extends TType, U extends TNumber> ScatterNdUpdate<T> scatterNdUpdate(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterNdUpdate.Options... options) {
+  public <T extends TType> ScatterNdUpdate<T> scatterNdUpdate(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterNdUpdate.Options... options) {
     return ScatterNdUpdate.create(scope, ref, indices, updates, options);
   }
 
@@ -5303,8 +5296,8 @@ public <T extends TType, U extends TNumber> ScatterNdUpdate<T> scatterNdUpdate(O
    * @param options carries optional attributes values
    * @return a new instance of ScatterSub
    */
-  public <T extends TType, U extends TNumber> ScatterSub<T> scatterSub(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterSub.Options... options) {
+  public <T extends TType> ScatterSub<T> scatterSub(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterSub.Options... options) {
     return ScatterSub.create(scope, ref, indices, updates, options);
   }
 
@@ -5344,8 +5337,8 @@ public <T extends TType, U extends TNumber> ScatterSub<T> scatterSub(Operand<T>
    * @param options carries optional attributes values
    * @return a new instance of ScatterUpdate
    */
-  public <T extends TType, U extends TNumber> ScatterUpdate<T> scatterUpdate(Operand<T> ref,
-      Operand<U> indices, Operand<T> updates, ScatterUpdate.Options... options) {
+  public <T extends TType> ScatterUpdate<T> scatterUpdate(Operand<T> ref,
+      Operand<? extends TNumber> indices, Operand<T> updates, ScatterUpdate.Options... options) {
     return ScatterUpdate.create(scope, ref, indices, updates, options);
   }
 
@@ -5443,7 +5436,7 @@ public <T extends TType, U extends TNumber> SetDiff1d<T, U> setDiff1d(Operand<T>
    * @param options carries optional attributes values
    * @return a new instance of SetSize
    */
-  public <T extends TType> SetSize setSize(Operand<TInt64> setIndices, Operand<T> setValues,
+  public SetSize setSize(Operand<TInt64> setIndices, Operand<? extends TType> setValues,
       Operand<TInt64> setShape, SetSize.Options... options) {
     return SetSize.create(scope, setIndices, setValues, setShape, options);
   }
@@ -5463,7 +5456,7 @@ public <T extends TType> SetSize setSize(Operand<TInt64> setIndices, Operand<T>
    * @param input
    * @return a new instance of Shape
    */
-  public <T extends TType> org.tensorflow.op.core.Shape<TInt32> shape(Operand<T> input) {
+  public org.tensorflow.op.core.Shape<TInt32> shape(Operand<? extends TType> input) {
     return org.tensorflow.op.core.Shape.create(scope, input);
   }
 
@@ -5483,8 +5476,8 @@ public <T extends TType> org.tensorflow.op.core.Shape<TInt32> shape(Operand<T> i
    * @param outType
    * @return a new instance of Shape
    */
-  public <U extends TNumber, T extends TType> org.tensorflow.op.core.Shape<U> shape(
-      Operand<T> input, Class<U> outType) {
+  public <U extends TNumber> org.tensorflow.op.core.Shape<U> shape(Operand<? extends TType> input,
+      Class<U> outType) {
     return org.tensorflow.op.core.Shape.create(scope, input, outType);
   }
 
@@ -5532,7 +5525,7 @@ public <U extends TNumber, T extends TType> ShapeN<U> shapeN(Iterable<Operand<T>
    * @param input
    * @return a new instance of Size
    */
-  public <T extends TType> Size<TInt32> size(Operand<T> input) {
+  public Size<TInt32> size(Operand<? extends TType> input) {
     return Size.create(scope, input);
   }
 
@@ -5553,7 +5546,7 @@ public <T extends TType> Size<TInt32> size(Operand<T> input) {
    * @param outType
    * @return a new instance of Size
    */
-  public <U extends TNumber, T extends TType> Size<U> size(Operand<T> input, Class<U> outType) {
+  public <U extends TNumber> Size<U> size(Operand<? extends TType> input, Class<U> outType) {
     return Size.create(scope, input, outType);
   }
 
@@ -5715,8 +5708,8 @@ public <T extends TType> Snapshot<T> snapshot(Operand<T> input) {
    *  regular convolution.
    * @return a new instance of SpaceToBatchNd
    */
-  public <T extends TType, U extends TNumber, V extends TNumber> SpaceToBatchNd<T> spaceToBatchNd(
-      Operand<T> input, Operand<U> blockShape, Operand<V> paddings) {
+  public <T extends TType> SpaceToBatchNd<T> spaceToBatchNd(Operand<T> input,
+      Operand<? extends TNumber> blockShape, Operand<? extends TNumber> paddings) {
     return SpaceToBatchNd.create(scope, input, blockShape, paddings);
   }
 
@@ -5748,8 +5741,8 @@ public <T extends TType> Split<T> split(Operand<TInt32> axis, Operand<T> value,
    * @param numSplit
    * @return a new instance of SplitV
    */
-  public <T extends TType, U extends TNumber> SplitV<T> splitV(Operand<T> value,
-      Operand<U> sizeSplits, Operand<TInt32> axis, Long numSplit) {
+  public <T extends TType> SplitV<T> splitV(Operand<T> value, Operand<? extends TNumber> sizeSplits,
+      Operand<TInt32> axis, Long numSplit) {
     return SplitV.create(scope, value, sizeSplits, axis, numSplit);
   }
 
@@ -6080,7 +6073,7 @@ public <U extends TType, T extends TNumber> StridedSliceGrad<U> stridedSliceGrad
    * @param options carries optional attributes values
    * @return a new instance of Sum
    */
-  public <T extends TType, U extends TNumber> Sum<T> sum(Operand<T> input, Operand<U> axis,
+  public <T extends TType> Sum<T> sum(Operand<T> input, Operand<? extends TNumber> axis,
       Sum.Options... options) {
     return Sum.create(scope, input, axis, options);
   }
@@ -6317,8 +6310,8 @@ public <T extends TType> TensorArrayRead<T> tensorArrayRead(Operand<?> handle,
    * @param flowIn A float scalar that enforces proper chaining of operations.
    * @return a new instance of TensorArrayScatter
    */
-  public <T extends TType> TensorArrayScatter tensorArrayScatter(Operand<?> handle,
-      Operand<TInt32> indices, Operand<T> value, Operand<TFloat32> flowIn) {
+  public TensorArrayScatter tensorArrayScatter(Operand<?> handle, Operand<TInt32> indices,
+      Operand<? extends TType> value, Operand<TFloat32> flowIn) {
     return TensorArrayScatter.create(scope, handle, indices, value, flowIn);
   }
 
@@ -6364,7 +6357,7 @@ public TensorArraySize tensorArraySize(Operand<?> handle, Operand<TFloat32> flow
    * @param flowIn A float scalar that enforces proper chaining of operations.
    * @return a new instance of TensorArraySplit
    */
-  public <T extends TType> TensorArraySplit tensorArraySplit(Operand<?> handle, Operand<T> value,
+  public TensorArraySplit tensorArraySplit(Operand<?> handle, Operand<? extends TType> value,
       Operand<TInt64> lengths, Operand<TFloat32> flowIn) {
     return TensorArraySplit.create(scope, handle, value, lengths, flowIn);
   }
@@ -6376,8 +6369,8 @@ public <T extends TType> TensorArraySplit tensorArraySplit(Operand<?> handle, Op
    * @param flowIn
    * @return a new instance of TensorArrayUnpack
    */
-  public <T extends TType> TensorArrayUnpack tensorArrayUnpack(Operand<TString> handle,
-      Operand<T> value, Operand<TFloat32> flowIn) {
+  public TensorArrayUnpack tensorArrayUnpack(Operand<TString> handle,
+      Operand<? extends TType> value, Operand<TFloat32> flowIn) {
     return TensorArrayUnpack.create(scope, handle, value, flowIn);
   }
 
@@ -6390,8 +6383,8 @@ public <T extends TType> TensorArrayUnpack tensorArrayUnpack(Operand<TString> ha
    * @param flowIn A float scalar that enforces proper chaining of operations.
    * @return a new instance of TensorArrayWrite
    */
-  public <T extends TType> TensorArrayWrite tensorArrayWrite(Operand<?> handle,
-      Operand<TInt32> index, Operand<T> value, Operand<TFloat32> flowIn) {
+  public TensorArrayWrite tensorArrayWrite(Operand<?> handle, Operand<TInt32> index,
+      Operand<? extends TType> value, Operand<TFloat32> flowIn) {
     return TensorArrayWrite.create(scope, handle, index, value, flowIn);
   }
 
@@ -6417,9 +6410,8 @@ public <T extends TType> TensorArrayWrite tensorArrayWrite(Operand<?> handle,
    * @param elementDtype
    * @return a new instance of TensorListConcat
    */
-  public <U extends TType, T extends TNumber> TensorListConcat<U> tensorListConcat(
-      Operand<?> inputHandle, Operand<T> elementShape, Operand<TInt64> leadingDims,
-      Class<U> elementDtype) {
+  public <U extends TType> TensorListConcat<U> tensorListConcat(Operand<?> inputHandle,
+      Operand<? extends TNumber> elementShape, Operand<TInt64> leadingDims, Class<U> elementDtype) {
     return TensorListConcat.create(scope, inputHandle, elementShape, leadingDims, elementDtype);
   }
 
@@ -6463,8 +6455,8 @@ public <T extends TNumber> TensorListElementShape<T> tensorListElementShape(
    * @param elementShape
    * @return a new instance of TensorListFromTensor
    */
-  public <T extends TType, U extends TNumber> TensorListFromTensor tensorListFromTensor(
-      Operand<T> tensor, Operand<U> elementShape) {
+  public TensorListFromTensor tensorListFromTensor(Operand<? extends TType> tensor,
+      Operand<? extends TNumber> elementShape) {
     return TensorListFromTensor.create(scope, tensor, elementShape);
   }
 
@@ -6551,8 +6543,8 @@ public <T extends TType> TensorListPopBack<T> tensorListPopBack(Operand<?> input
    * @param tensor
    * @return a new instance of TensorListPushBack
    */
-  public <T extends TType> TensorListPushBack tensorListPushBack(Operand<?> inputHandle,
-      Operand<T> tensor) {
+  public TensorListPushBack tensorListPushBack(Operand<?> inputHandle,
+      Operand<? extends TType> tensor) {
     return TensorListPushBack.create(scope, inputHandle, tensor);
   }
 
@@ -6562,8 +6554,8 @@ public <T extends TType> TensorListPushBack tensorListPushBack(Operand<?> inputH
    * @param tensor
    * @return a new instance of TensorListPushBackBatch
    */
-  public <T extends TType> TensorListPushBackBatch tensorListPushBackBatch(Operand<?> inputHandles,
-      Operand<T> tensor) {
+  public TensorListPushBackBatch tensorListPushBackBatch(Operand<?> inputHandles,
+      Operand<? extends TType> tensor) {
     return TensorListPushBackBatch.create(scope, inputHandles, tensor);
   }
 
@@ -6580,8 +6572,8 @@ public <T extends TType> TensorListPushBackBatch tensorListPushBackBatch(Operand
    * @param elementDtype
    * @return a new instance of TensorListReserve
    */
-  public <T extends TNumber, U extends TType> TensorListReserve tensorListReserve(
-      Operand<T> elementShape, Operand<TInt32> numElements, Class<U> elementDtype) {
+  public <U extends TType> TensorListReserve tensorListReserve(
+      Operand<? extends TNumber> elementShape, Operand<TInt32> numElements, Class<U> elementDtype) {
     return TensorListReserve.create(scope, elementShape, numElements, elementDtype);
   }
 
@@ -6621,8 +6613,9 @@ public TensorListResize tensorListResize(Operand<?> inputHandle, Operand<TInt32>
    * @param numElements
    * @return a new instance of TensorListScatter
    */
-  public <T extends TType, U extends TNumber> TensorListScatter tensorListScatter(Operand<T> tensor,
-      Operand<TInt32> indices, Operand<U> elementShape, Operand<TInt32> numElements) {
+  public TensorListScatter tensorListScatter(Operand<? extends TType> tensor,
+      Operand<TInt32> indices, Operand<? extends TNumber> elementShape,
+      Operand<TInt32> numElements) {
     return TensorListScatter.create(scope, tensor, indices, elementShape, numElements);
   }
 
@@ -6642,8 +6635,8 @@ public <T extends TType, U extends TNumber> TensorListScatter tensorListScatter(
    * @param indices
    * @return a new instance of TensorListScatterIntoExistingList
    */
-  public <T extends TType> TensorListScatterIntoExistingList tensorListScatterIntoExistingList(
-      Operand<?> inputHandle, Operand<T> tensor, Operand<TInt32> indices) {
+  public TensorListScatterIntoExistingList tensorListScatterIntoExistingList(Operand<?> inputHandle,
+      Operand<? extends TType> tensor, Operand<TInt32> indices) {
     return TensorListScatterIntoExistingList.create(scope, inputHandle, tensor, indices);
   }
 
@@ -6654,8 +6647,8 @@ public <T extends TType> TensorListScatterIntoExistingList tensorListScatterInto
    * @param item
    * @return a new instance of TensorListSetItem
    */
-  public <T extends TType> TensorListSetItem tensorListSetItem(Operand<?> inputHandle,
-      Operand<TInt32> index, Operand<T> item) {
+  public TensorListSetItem tensorListSetItem(Operand<?> inputHandle, Operand<TInt32> index,
+      Operand<? extends TType> item) {
     return TensorListSetItem.create(scope, inputHandle, index, item);
   }
 
@@ -6675,8 +6668,8 @@ public <T extends TType> TensorListSetItem tensorListSetItem(Operand<?> inputHan
    * @param lengths
    * @return a new instance of TensorListSplit
    */
-  public <T extends TType, U extends TNumber> TensorListSplit tensorListSplit(Operand<T> tensor,
-      Operand<U> elementShape, Operand<TInt64> lengths) {
+  public TensorListSplit tensorListSplit(Operand<? extends TType> tensor,
+      Operand<? extends TNumber> elementShape, Operand<TInt64> lengths) {
     return TensorListSplit.create(scope, tensor, elementShape, lengths);
   }
 
@@ -6701,32 +6694,6 @@ public <T extends TType> TensorListStack<T> tensorListStack(Operand<?> inputHand
     return TensorListStack.create(scope, inputHandle, elementShape, elementDtype, options);
   }
 
-  /**
-   *
-   * @param <T> data type for {@code output()} output
-   * @param tensor Tensor to update.
-   * @param indices Index tensor.
-   * @param updates Updates to scatter into output.
-   * @return a new instance of TensorScatterMax
-   */
-  public <T extends TType, U extends TNumber> TensorScatterMax<T> tensorScatterMax(
-      Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
-    return TensorScatterMax.create(scope, tensor, indices, updates);
-  }
-
-  /**
-   *
-   * @param <T> data type for {@code output()} output
-   * @param tensor Tensor to update.
-   * @param indices Index tensor.
-   * @param updates Updates to scatter into output.
-   * @return a new instance of TensorScatterMin
-   */
-  public <T extends TType, U extends TNumber> TensorScatterMin<T> tensorScatterMin(
-      Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
-    return TensorScatterMin.create(scope, tensor, indices, updates);
-  }
-
   /**
    * Adds sparse `updates` to an existing tensor according to `indices`.
    *  <p>
@@ -6796,8 +6763,8 @@ public <T extends TType, U extends TNumber> TensorScatterMin<T> tensorScatterMin
    * @param updates Updates to scatter into output.
    * @return a new instance of TensorScatterNdAdd
    */
-  public <T extends TType, U extends TNumber> TensorScatterNdAdd<T> tensorScatterNdAdd(
-      Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public <T extends TType> TensorScatterNdAdd<T> tensorScatterNdAdd(Operand<T> tensor,
+      Operand<? extends TNumber> indices, Operand<T> updates) {
     return TensorScatterNdAdd.create(scope, tensor, indices, updates);
   }
 
@@ -6809,8 +6776,8 @@ public <T extends TType, U extends TNumber> TensorScatterNdAdd<T> tensorScatterN
    * @param updates Updates to scatter into output.
    * @return a new instance of TensorScatterNdMax
    */
-  public <T extends TType, U extends TNumber> TensorScatterNdMax<T> tensorScatterNdMax(
-      Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public <T extends TType> TensorScatterNdMax<T> tensorScatterNdMax(Operand<T> tensor,
+      Operand<? extends TNumber> indices, Operand<T> updates) {
     return TensorScatterNdMax.create(scope, tensor, indices, updates);
   }
 
@@ -6822,8 +6789,8 @@ public <T extends TType, U extends TNumber> TensorScatterNdMax<T> tensorScatterN
    * @param updates Updates to scatter into output.
    * @return a new instance of TensorScatterNdMin
    */
-  public <T extends TType, U extends TNumber> TensorScatterNdMin<T> tensorScatterNdMin(
-      Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public <T extends TType> TensorScatterNdMin<T> tensorScatterNdMin(Operand<T> tensor,
+      Operand<? extends TNumber> indices, Operand<T> updates) {
     return TensorScatterNdMin.create(scope, tensor, indices, updates);
   }
 
@@ -6895,8 +6862,8 @@ public <T extends TType, U extends TNumber> TensorScatterNdMin<T> tensorScatterN
    * @param updates Updates to scatter into output.
    * @return a new instance of TensorScatterNdSub
    */
-  public <T extends TType, U extends TNumber> TensorScatterNdSub<T> tensorScatterNdSub(
-      Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public <T extends TType> TensorScatterNdSub<T> tensorScatterNdSub(Operand<T> tensor,
+      Operand<? extends TNumber> indices, Operand<T> updates) {
     return TensorScatterNdSub.create(scope, tensor, indices, updates);
   }
 
@@ -6983,8 +6950,8 @@ public <T extends TType, U extends TNumber> TensorScatterNdSub<T> tensorScatterN
    * @param updates Updates to scatter into output.
    * @return a new instance of TensorScatterNdUpdate
    */
-  public <T extends TType, U extends TNumber> TensorScatterNdUpdate<T> tensorScatterNdUpdate(
-      Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public <T extends TType> TensorScatterNdUpdate<T> tensorScatterNdUpdate(Operand<T> tensor,
+      Operand<? extends TNumber> indices, Operand<T> updates) {
     return TensorScatterNdUpdate.create(scope, tensor, indices, updates);
   }
 
@@ -7048,7 +7015,7 @@ public <T extends TType, U extends TNumber> TensorStridedSliceUpdate<T> tensorSt
    * @param multiples 1-D. Length must be the same as the number of dimensions in `input`
    * @return a new instance of Tile
    */
-  public <T extends TType, U extends TNumber> Tile<T> tile(Operand<T> input, Operand<U> multiples) {
+  public <T extends TType> Tile<T> tile(Operand<T> input, Operand<? extends TNumber> multiples) {
     return Tile.create(scope, input, multiples);
   }
 
@@ -7248,8 +7215,7 @@ public <T extends TType> UnbatchGrad<T> unbatchGrad(Operand<T> originalInput,
    *  find the unique elements.
    * @return a new instance of Unique
    */
-  public <T extends TType, U extends TNumber> Unique<T, TInt32> unique(Operand<T> x,
-      Operand<U> axis) {
+  public <T extends TType> Unique<T, TInt32> unique(Operand<T> x, Operand<? extends TNumber> axis) {
     return Unique.create(scope, x, axis);
   }
 
@@ -7303,8 +7269,8 @@ public <T extends TType, U extends TNumber> Unique<T, TInt32> unique(Operand<T>
    * @param outIdx
    * @return a new instance of Unique
    */
-  public <T extends TType, V extends TNumber, U extends TNumber> Unique<T, V> unique(Operand<T> x,
-      Operand<U> axis, Class<V> outIdx) {
+  public <T extends TType, V extends TNumber> Unique<T, V> unique(Operand<T> x,
+      Operand<? extends TNumber> axis, Class<V> outIdx) {
     return Unique.create(scope, x, axis, outIdx);
   }
 
@@ -7361,8 +7327,8 @@ public <T extends TType, V extends TNumber, U extends TNumber> Unique<T, V> uniq
    *  find the unique elements.
    * @return a new instance of UniqueWithCounts
    */
-  public <T extends TType, U extends TNumber> UniqueWithCounts<T, TInt32> uniqueWithCounts(
-      Operand<T> x, Operand<U> axis) {
+  public <T extends TType> UniqueWithCounts<T, TInt32> uniqueWithCounts(Operand<T> x,
+      Operand<? extends TNumber> axis) {
     return UniqueWithCounts.create(scope, x, axis);
   }
 
@@ -7420,8 +7386,8 @@ public <T extends TType, U extends TNumber> UniqueWithCounts<T, TInt32> uniqueWi
    * @param outIdx
    * @return a new instance of UniqueWithCounts
    */
-  public <T extends TType, V extends TNumber, U extends TNumber> UniqueWithCounts<T, V> uniqueWithCounts(
-      Operand<T> x, Operand<U> axis, Class<V> outIdx) {
+  public <T extends TType, V extends TNumber> UniqueWithCounts<T, V> uniqueWithCounts(Operand<T> x,
+      Operand<? extends TNumber> axis, Class<V> outIdx) {
     return UniqueWithCounts.create(scope, x, axis, outIdx);
   }
 
@@ -7659,7 +7625,7 @@ public <T extends TNumber> VariableShape<T> variableShape(Operand<?> input, Clas
    * @param condition
    * @return a new instance of Where
    */
-  public <T extends TType> Where where(Operand<T> condition) {
+  public Where where(Operand<? extends TType> condition) {
     return Where.create(scope, condition);
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/QuantizationOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/QuantizationOps.java
index bcca8f36505..812f2563605 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/QuantizationOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/QuantizationOps.java
@@ -109,8 +109,8 @@ public final class QuantizationOps {
    * @param options carries optional attributes values
    * @return a new instance of Dequantize
    */
-  public <T extends TType> Dequantize<TFloat32> dequantize(Operand<T> input,
-      Operand<TFloat32> minRange, Operand<TFloat32> maxRange, Dequantize.Options... options) {
+  public Dequantize<TFloat32> dequantize(Operand<? extends TType> input, Operand<TFloat32> minRange,
+      Operand<TFloat32> maxRange, Dequantize.Options... options) {
     return Dequantize.create(scope, input, minRange, maxRange, options);
   }
 
@@ -174,7 +174,7 @@ public <T extends TType> Dequantize<TFloat32> dequantize(Operand<T> input,
    * @param options carries optional attributes values
    * @return a new instance of Dequantize
    */
-  public <U extends TNumber, T extends TType> Dequantize<U> dequantize(Operand<T> input,
+  public <U extends TNumber> Dequantize<U> dequantize(Operand<? extends TType> input,
       Operand<TFloat32> minRange, Operand<TFloat32> maxRange, Class<U> dtype,
       Dequantize.Options... options) {
     return Dequantize.create(scope, input, minRange, maxRange, dtype, options);
@@ -563,8 +563,9 @@ public <T extends TNumber> QuantizeAndDequantize<T> quantizeAndDequantize(Operan
    * @param outType The type of the output. Should be a lower bit depth than Tinput.
    * @return a new instance of QuantizeDownAndShrinkRange
    */
-  public <U extends TType, T extends TType> QuantizeDownAndShrinkRange<U> quantizeDownAndShrinkRange(
-      Operand<T> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Class<U> outType) {
+  public <U extends TType> QuantizeDownAndShrinkRange<U> quantizeDownAndShrinkRange(
+      Operand<? extends TType> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax,
+      Class<U> outType) {
     return QuantizeDownAndShrinkRange.create(scope, input, inputMin, inputMax, outType);
   }
 
@@ -599,7 +600,7 @@ public <T extends TType> QuantizedConcat<T> quantizedConcat(Operand<TInt32> conc
    * @param inputMax The float value that the maximum quantized input value represents.
    * @return a new instance of RequantizationRange
    */
-  public <T extends TType> RequantizationRange requantizationRange(Operand<T> input,
+  public RequantizationRange requantizationRange(Operand<? extends TType> input,
       Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
     return RequantizationRange.create(scope, input, inputMin, inputMax);
   }
@@ -624,7 +625,7 @@ public <T extends TType> RequantizationRange requantizationRange(Operand<T> inpu
    * @param outType The type of the output. Should be a lower bit depth than Tinput.
    * @return a new instance of Requantize
    */
-  public <U extends TType, T extends TType> Requantize<U> requantize(Operand<T> input,
+  public <U extends TType> Requantize<U> requantize(Operand<? extends TType> input,
       Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Operand<TFloat32> requestedOutputMin,
       Operand<TFloat32> requestedOutputMax, Class<U> outType) {
     return Requantize.create(scope, input, inputMin, inputMax, requestedOutputMin, requestedOutputMax, outType);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/RandomOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/RandomOps.java
index f0c3b8c660c..b1083100c6f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/RandomOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/RandomOps.java
@@ -126,7 +126,7 @@ public LogUniformCandidateSampler logUniformCandidateSampler(Operand<TInt64> tru
    * @param options carries optional attributes values
    * @return a new instance of Multinomial
    */
-  public <T extends TNumber> Multinomial<TInt64> multinomial(Operand<T> logits,
+  public Multinomial<TInt64> multinomial(Operand<? extends TNumber> logits,
       Operand<TInt32> numSamples, Multinomial.Options... options) {
     return Multinomial.create(scope, logits, numSamples, options);
   }
@@ -142,7 +142,7 @@ public <T extends TNumber> Multinomial<TInt64> multinomial(Operand<T> logits,
    * @param options carries optional attributes values
    * @return a new instance of Multinomial
    */
-  public <U extends TNumber, T extends TNumber> Multinomial<U> multinomial(Operand<T> logits,
+  public <U extends TNumber> Multinomial<U> multinomial(Operand<? extends TNumber> logits,
       Operand<TInt32> numSamples, Class<U> outputDtype, Multinomial.Options... options) {
     return Multinomial.create(scope, logits, numSamples, outputDtype, options);
   }
@@ -163,9 +163,9 @@ public <U extends TNumber, T extends TNumber> Multinomial<U> multinomial(Operand
    * @param options carries optional attributes values
    * @return a new instance of ParameterizedTruncatedNormal
    */
-  public <U extends TNumber, T extends TNumber> ParameterizedTruncatedNormal<U> parameterizedTruncatedNormal(
-      Operand<T> shape, Operand<U> means, Operand<U> stdevs, Operand<U> minvals, Operand<U> maxvals,
-      ParameterizedTruncatedNormal.Options... options) {
+  public <U extends TNumber> ParameterizedTruncatedNormal<U> parameterizedTruncatedNormal(
+      Operand<? extends TNumber> shape, Operand<U> means, Operand<U> stdevs, Operand<U> minvals,
+      Operand<U> maxvals, ParameterizedTruncatedNormal.Options... options) {
     return ParameterizedTruncatedNormal.create(scope, shape, means, stdevs, minvals, maxvals, options);
   }
 
@@ -184,7 +184,7 @@ public <U extends TNumber, T extends TNumber> ParameterizedTruncatedNormal<U> pa
    * @param options carries optional attributes values
    * @return a new instance of RandomGamma
    */
-  public <U extends TNumber, T extends TNumber> RandomGamma<U> randomGamma(Operand<T> shape,
+  public <U extends TNumber> RandomGamma<U> randomGamma(Operand<? extends TNumber> shape,
       Operand<U> alpha, RandomGamma.Options... options) {
     return RandomGamma.create(scope, shape, alpha, options);
   }
@@ -210,8 +210,8 @@ public <U extends TNumber, T extends TNumber> RandomGamma<U> randomGamma(Operand
    * @param options carries optional attributes values
    * @return a new instance of RandomPoisson
    */
-  public <T extends TNumber, U extends TNumber> RandomPoisson<TInt64> randomPoisson(
-      Operand<T> shape, Operand<U> rate, RandomPoisson.Options... options) {
+  public RandomPoisson<TInt64> randomPoisson(Operand<? extends TNumber> shape,
+      Operand<? extends TNumber> rate, RandomPoisson.Options... options) {
     return RandomPoisson.create(scope, shape, rate, options);
   }
 
@@ -237,8 +237,8 @@ public <T extends TNumber, U extends TNumber> RandomPoisson<TInt64> randomPoisso
    * @param options carries optional attributes values
    * @return a new instance of RandomPoisson
    */
-  public <V extends TNumber, T extends TNumber, U extends TNumber> RandomPoisson<V> randomPoisson(
-      Operand<T> shape, Operand<U> rate, Class<V> dtype, RandomPoisson.Options... options) {
+  public <V extends TNumber> RandomPoisson<V> randomPoisson(Operand<? extends TNumber> shape,
+      Operand<? extends TNumber> rate, Class<V> dtype, RandomPoisson.Options... options) {
     return RandomPoisson.create(scope, shape, rate, dtype, options);
   }
 
@@ -275,8 +275,8 @@ public <T extends TType> RandomShuffle<T> randomShuffle(Operand<T> value,
    * @param options carries optional attributes values
    * @return a new instance of RandomStandardNormal
    */
-  public <U extends TNumber, T extends TNumber> RandomStandardNormal<U> randomStandardNormal(
-      Operand<T> shape, Class<U> dtype, RandomStandardNormal.Options... options) {
+  public <U extends TNumber> RandomStandardNormal<U> randomStandardNormal(
+      Operand<? extends TNumber> shape, Class<U> dtype, RandomStandardNormal.Options... options) {
     return RandomStandardNormal.create(scope, shape, dtype, options);
   }
 
@@ -292,7 +292,7 @@ public <U extends TNumber, T extends TNumber> RandomStandardNormal<U> randomStan
    * @param options carries optional attributes values
    * @return a new instance of RandomUniform
    */
-  public <U extends TNumber, T extends TNumber> RandomUniform<U> randomUniform(Operand<T> shape,
+  public <U extends TNumber> RandomUniform<U> randomUniform(Operand<? extends TNumber> shape,
       Class<U> dtype, RandomUniform.Options... options) {
     return RandomUniform.create(scope, shape, dtype, options);
   }
@@ -315,8 +315,8 @@ public <U extends TNumber, T extends TNumber> RandomUniform<U> randomUniform(Ope
    * @param options carries optional attributes values
    * @return a new instance of RandomUniformInt
    */
-  public <U extends TNumber, T extends TNumber> RandomUniformInt<U> randomUniformInt(
-      Operand<T> shape, Operand<U> minval, Operand<U> maxval, RandomUniformInt.Options... options) {
+  public <U extends TNumber> RandomUniformInt<U> randomUniformInt(Operand<? extends TNumber> shape,
+      Operand<U> minval, Operand<U> maxval, RandomUniformInt.Options... options) {
     return RandomUniformInt.create(scope, shape, minval, maxval, options);
   }
 
@@ -341,9 +341,9 @@ public RecordInput recordInput(String filePattern, RecordInput.Options... option
    * @param probs
    * @return a new instance of StatefulRandomBinomial
    */
-  public <T extends TNumber, U extends TNumber> StatefulRandomBinomial<TInt64> statefulRandomBinomial(
-      Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Operand<U> counts,
-      Operand<U> probs) {
+  public <U extends TNumber> StatefulRandomBinomial<TInt64> statefulRandomBinomial(
+      Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TNumber> shape,
+      Operand<U> counts, Operand<U> probs) {
     return StatefulRandomBinomial.create(scope, resource, algorithm, shape, counts, probs);
   }
 
@@ -358,9 +358,9 @@ public <T extends TNumber, U extends TNumber> StatefulRandomBinomial<TInt64> sta
    * @param dtype
    * @return a new instance of StatefulRandomBinomial
    */
-  public <V extends TNumber, T extends TNumber, U extends TNumber> StatefulRandomBinomial<V> statefulRandomBinomial(
-      Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Operand<U> counts,
-      Operand<U> probs, Class<V> dtype) {
+  public <V extends TNumber, U extends TNumber> StatefulRandomBinomial<V> statefulRandomBinomial(
+      Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TNumber> shape,
+      Operand<U> counts, Operand<U> probs, Class<V> dtype) {
     return StatefulRandomBinomial.create(scope, resource, algorithm, shape, counts, probs, dtype);
   }
 
@@ -375,8 +375,8 @@ public <V extends TNumber, T extends TNumber, U extends TNumber> StatefulRandomB
    * @param shape The shape of the output tensor.
    * @return a new instance of StatefulStandardNormal
    */
-  public <T extends TType> StatefulStandardNormal<TFloat32> statefulStandardNormal(
-      Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape) {
+  public StatefulStandardNormal<TFloat32> statefulStandardNormal(Operand<?> resource,
+      Operand<TInt64> algorithm, Operand<? extends TType> shape) {
     return StatefulStandardNormal.create(scope, resource, algorithm, shape);
   }
 
@@ -392,8 +392,8 @@ public <T extends TType> StatefulStandardNormal<TFloat32> statefulStandardNormal
    * @param dtype The type of the output.
    * @return a new instance of StatefulStandardNormal
    */
-  public <U extends TType, T extends TType> StatefulStandardNormal<U> statefulStandardNormal(
-      Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Class<U> dtype) {
+  public <U extends TType> StatefulStandardNormal<U> statefulStandardNormal(Operand<?> resource,
+      Operand<TInt64> algorithm, Operand<? extends TType> shape, Class<U> dtype) {
     return StatefulStandardNormal.create(scope, resource, algorithm, shape, dtype);
   }
 
@@ -407,8 +407,8 @@ public <U extends TType, T extends TType> StatefulStandardNormal<U> statefulStan
    * @param seed 2 seeds (shape [2]).
    * @return a new instance of StatelessMultinomial
    */
-  public <T extends TNumber, U extends TNumber> StatelessMultinomial<TInt64> statelessMultinomial(
-      Operand<T> logits, Operand<TInt32> numSamples, Operand<U> seed) {
+  public StatelessMultinomial<TInt64> statelessMultinomial(Operand<? extends TNumber> logits,
+      Operand<TInt32> numSamples, Operand<? extends TNumber> seed) {
     return StatelessMultinomial.create(scope, logits, numSamples, seed);
   }
 
@@ -423,8 +423,9 @@ public <T extends TNumber, U extends TNumber> StatelessMultinomial<TInt64> state
    * @param outputDtype
    * @return a new instance of StatelessMultinomial
    */
-  public <V extends TNumber, T extends TNumber, U extends TNumber> StatelessMultinomial<V> statelessMultinomial(
-      Operand<T> logits, Operand<TInt32> numSamples, Operand<U> seed, Class<V> outputDtype) {
+  public <V extends TNumber> StatelessMultinomial<V> statelessMultinomial(
+      Operand<? extends TNumber> logits, Operand<TInt32> numSamples,
+      Operand<? extends TNumber> seed, Class<V> outputDtype) {
     return StatelessMultinomial.create(scope, logits, numSamples, seed, outputDtype);
   }
 
@@ -440,8 +441,8 @@ public <V extends TNumber, T extends TNumber, U extends TNumber> StatelessMultin
    * @param seed 2 seeds (shape [2]).
    * @return a new instance of StatelessRandomNormal
    */
-  public <T extends TNumber, U extends TNumber> StatelessRandomNormal<TFloat32> statelessRandomNormal(
-      Operand<T> shape, Operand<U> seed) {
+  public StatelessRandomNormal<TFloat32> statelessRandomNormal(Operand<? extends TNumber> shape,
+      Operand<? extends TNumber> seed) {
     return StatelessRandomNormal.create(scope, shape, seed);
   }
 
@@ -458,8 +459,8 @@ public <T extends TNumber, U extends TNumber> StatelessRandomNormal<TFloat32> st
    * @param dtype The type of the output.
    * @return a new instance of StatelessRandomNormal
    */
-  public <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandomNormal<V> statelessRandomNormal(
-      Operand<T> shape, Operand<U> seed, Class<V> dtype) {
+  public <V extends TNumber> StatelessRandomNormal<V> statelessRandomNormal(
+      Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
     return StatelessRandomNormal.create(scope, shape, seed, dtype);
   }
 
@@ -476,8 +477,8 @@ public <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandom
    * @param seed 2 seeds (shape [2]).
    * @return a new instance of StatelessRandomUniform
    */
-  public <T extends TNumber, U extends TNumber> StatelessRandomUniform<TFloat32> statelessRandomUniform(
-      Operand<T> shape, Operand<U> seed) {
+  public StatelessRandomUniform<TFloat32> statelessRandomUniform(Operand<? extends TNumber> shape,
+      Operand<? extends TNumber> seed) {
     return StatelessRandomUniform.create(scope, shape, seed);
   }
 
@@ -495,8 +496,8 @@ public <T extends TNumber, U extends TNumber> StatelessRandomUniform<TFloat32> s
    * @param dtype The type of the output.
    * @return a new instance of StatelessRandomUniform
    */
-  public <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandomUniform<V> statelessRandomUniform(
-      Operand<T> shape, Operand<U> seed, Class<V> dtype) {
+  public <V extends TNumber> StatelessRandomUniform<V> statelessRandomUniform(
+      Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
     return StatelessRandomUniform.create(scope, shape, seed, dtype);
   }
 
@@ -514,8 +515,8 @@ public <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandom
    * @param seed 2 seeds (shape [2]).
    * @return a new instance of StatelessTruncatedNormal
    */
-  public <T extends TNumber, U extends TNumber> StatelessTruncatedNormal<TFloat32> statelessTruncatedNormal(
-      Operand<T> shape, Operand<U> seed) {
+  public StatelessTruncatedNormal<TFloat32> statelessTruncatedNormal(
+      Operand<? extends TNumber> shape, Operand<? extends TNumber> seed) {
     return StatelessTruncatedNormal.create(scope, shape, seed);
   }
 
@@ -534,8 +535,8 @@ public <T extends TNumber, U extends TNumber> StatelessTruncatedNormal<TFloat32>
    * @param dtype The type of the output.
    * @return a new instance of StatelessTruncatedNormal
    */
-  public <V extends TNumber, T extends TNumber, U extends TNumber> StatelessTruncatedNormal<V> statelessTruncatedNormal(
-      Operand<T> shape, Operand<U> seed, Class<V> dtype) {
+  public <V extends TNumber> StatelessTruncatedNormal<V> statelessTruncatedNormal(
+      Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
     return StatelessTruncatedNormal.create(scope, shape, seed, dtype);
   }
 
@@ -552,7 +553,7 @@ public <V extends TNumber, T extends TNumber, U extends TNumber> StatelessTrunca
    * @param options carries optional attributes values
    * @return a new instance of TruncatedNormal
    */
-  public <U extends TNumber, T extends TNumber> TruncatedNormal<U> truncatedNormal(Operand<T> shape,
+  public <U extends TNumber> TruncatedNormal<U> truncatedNormal(Operand<? extends TNumber> shape,
       Class<U> dtype, TruncatedNormal.Options... options) {
     return TruncatedNormal.create(scope, shape, dtype, options);
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SignalOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SignalOps.java
index e8ac9a0e53b..14d56516167 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SignalOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SignalOps.java
@@ -216,7 +216,7 @@ public <T extends TType> Ifft3d<T> ifft3d(Operand<T> input) {
    * @param fftLength An int32 tensor of shape [1]. The FFT length.
    * @return a new instance of Irfft
    */
-  public <T extends TType> Irfft<TFloat32> irfft(Operand<T> input, Operand<TInt32> fftLength) {
+  public Irfft<TFloat32> irfft(Operand<? extends TType> input, Operand<TInt32> fftLength) {
     return Irfft.create(scope, input, fftLength);
   }
 
@@ -243,7 +243,7 @@ public <T extends TType> Irfft<TFloat32> irfft(Operand<T> input, Operand<TInt32>
    * @param Treal
    * @return a new instance of Irfft
    */
-  public <U extends TNumber, T extends TType> Irfft<U> irfft(Operand<T> input,
+  public <U extends TNumber> Irfft<U> irfft(Operand<? extends TType> input,
       Operand<TInt32> fftLength, Class<U> Treal) {
     return Irfft.create(scope, input, fftLength, Treal);
   }
@@ -271,7 +271,7 @@ public <U extends TNumber, T extends TType> Irfft<U> irfft(Operand<T> input,
    * @param fftLength An int32 tensor of shape [2]. The FFT length for each dimension.
    * @return a new instance of Irfft2d
    */
-  public <T extends TType> Irfft2d<TFloat32> irfft2d(Operand<T> input, Operand<TInt32> fftLength) {
+  public Irfft2d<TFloat32> irfft2d(Operand<? extends TType> input, Operand<TInt32> fftLength) {
     return Irfft2d.create(scope, input, fftLength);
   }
 
@@ -299,7 +299,7 @@ public <T extends TType> Irfft2d<TFloat32> irfft2d(Operand<T> input, Operand<TIn
    * @param Treal
    * @return a new instance of Irfft2d
    */
-  public <U extends TNumber, T extends TType> Irfft2d<U> irfft2d(Operand<T> input,
+  public <U extends TNumber> Irfft2d<U> irfft2d(Operand<? extends TType> input,
       Operand<TInt32> fftLength, Class<U> Treal) {
     return Irfft2d.create(scope, input, fftLength, Treal);
   }
@@ -327,7 +327,7 @@ public <U extends TNumber, T extends TType> Irfft2d<U> irfft2d(Operand<T> input,
    * @param fftLength An int32 tensor of shape [3]. The FFT length for each dimension.
    * @return a new instance of Irfft3d
    */
-  public <T extends TType> Irfft3d<TFloat32> irfft3d(Operand<T> input, Operand<TInt32> fftLength) {
+  public Irfft3d<TFloat32> irfft3d(Operand<? extends TType> input, Operand<TInt32> fftLength) {
     return Irfft3d.create(scope, input, fftLength);
   }
 
@@ -355,7 +355,7 @@ public <T extends TType> Irfft3d<TFloat32> irfft3d(Operand<T> input, Operand<TIn
    * @param Treal
    * @return a new instance of Irfft3d
    */
-  public <U extends TNumber, T extends TType> Irfft3d<U> irfft3d(Operand<T> input,
+  public <U extends TNumber> Irfft3d<U> irfft3d(Operand<? extends TType> input,
       Operand<TInt32> fftLength, Class<U> Treal) {
     return Irfft3d.create(scope, input, fftLength, Treal);
   }
@@ -380,8 +380,8 @@ public <U extends TNumber, T extends TType> Irfft3d<U> irfft3d(Operand<T> input,
    * @param Tcomplex
    * @return a new instance of Rfft
    */
-  public <U extends TType, T extends TNumber> Rfft<U> rfft(Operand<T> input,
-      Operand<TInt32> fftLength, Class<U> Tcomplex) {
+  public <U extends TType> Rfft<U> rfft(Operand<? extends TNumber> input, Operand<TInt32> fftLength,
+      Class<U> Tcomplex) {
     return Rfft.create(scope, input, fftLength, Tcomplex);
   }
 
@@ -406,7 +406,7 @@ public <U extends TType, T extends TNumber> Rfft<U> rfft(Operand<T> input,
    * @param Tcomplex
    * @return a new instance of Rfft2d
    */
-  public <U extends TType, T extends TNumber> Rfft2d<U> rfft2d(Operand<T> input,
+  public <U extends TType> Rfft2d<U> rfft2d(Operand<? extends TNumber> input,
       Operand<TInt32> fftLength, Class<U> Tcomplex) {
     return Rfft2d.create(scope, input, fftLength, Tcomplex);
   }
@@ -432,7 +432,7 @@ public <U extends TType, T extends TNumber> Rfft2d<U> rfft2d(Operand<T> input,
    * @param Tcomplex
    * @return a new instance of Rfft3d
    */
-  public <U extends TType, T extends TNumber> Rfft3d<U> rfft3d(Operand<T> input,
+  public <U extends TType> Rfft3d<U> rfft3d(Operand<? extends TNumber> input,
       Operand<TInt32> fftLength, Class<U> Tcomplex) {
     return Rfft3d.create(scope, input, fftLength, Tcomplex);
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SparseOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SparseOps.java
index 3971fc6fc06..06109db5383 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SparseOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SparseOps.java
@@ -119,8 +119,8 @@ public final class SparseOps {
    * @param options carries optional attributes values
    * @return a new instance of AddManySparseToTensorsMap
    */
-  public <T extends TType> AddManySparseToTensorsMap addManySparseToTensorsMap(
-      Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape,
+  public AddManySparseToTensorsMap addManySparseToTensorsMap(Operand<TInt64> sparseIndices,
+      Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape,
       AddManySparseToTensorsMap.Options... options) {
     return AddManySparseToTensorsMap.create(scope, sparseIndices, sparseValues, sparseShape, options);
   }
@@ -149,8 +149,8 @@ public <T extends TType> AddManySparseToTensorsMap addManySparseToTensorsMap(
    * @param options carries optional attributes values
    * @return a new instance of AddSparseToTensorsMap
    */
-  public <T extends TType> AddSparseToTensorsMap addSparseToTensorsMap(
-      Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape,
+  public AddSparseToTensorsMap addSparseToTensorsMap(Operand<TInt64> sparseIndices,
+      Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape,
       AddSparseToTensorsMap.Options... options) {
     return AddSparseToTensorsMap.create(scope, sparseIndices, sparseValues, sparseShape, options);
   }
@@ -270,8 +270,8 @@ public <T extends TType> DenseToSparseSetOperation<T> denseToSparseSetOperation(
    * @param dtype The `dtype` of the serialized `SparseTensor` objects.
    * @return a new instance of DeserializeSparse
    */
-  public <U extends TType, T extends TType> DeserializeSparse<U> deserializeSparse(
-      Operand<T> serializedSparse, Class<U> dtype) {
+  public <U extends TType> DeserializeSparse<U> deserializeSparse(
+      Operand<? extends TType> serializedSparse, Class<U> dtype) {
     return DeserializeSparse.create(scope, serializedSparse, dtype);
   }
 
@@ -293,9 +293,10 @@ public <U extends TType, T extends TType> DeserializeSparse<U> deserializeSparse
    *  case the input is ignored during validation.
    * @return a new instance of SparseAccumulatorApplyGradient
    */
-  public <T extends TType> SparseAccumulatorApplyGradient sparseAccumulatorApplyGradient(
-      Operand<TString> handle, Operand<TInt64> localStep, Operand<TInt64> gradientIndices,
-      Operand<T> gradientValues, Operand<TInt64> gradientShape, Boolean hasKnownShape) {
+  public SparseAccumulatorApplyGradient sparseAccumulatorApplyGradient(Operand<TString> handle,
+      Operand<TInt64> localStep, Operand<TInt64> gradientIndices,
+      Operand<? extends TType> gradientValues, Operand<TInt64> gradientShape,
+      Boolean hasKnownShape) {
     return SparseAccumulatorApplyGradient.create(scope, handle, localStep, gradientIndices, gradientValues, gradientShape, hasKnownShape);
   }
 
@@ -349,9 +350,9 @@ public <T extends TType> SparseAccumulatorTakeGradient<T> sparseAccumulatorTakeG
    *  pair takes space.
    * @return a new instance of SparseAdd
    */
-  public <T extends TType, U extends TNumber> SparseAdd<T> sparseAdd(Operand<TInt64> aIndices,
-      Operand<T> aValues, Operand<TInt64> aShape, Operand<TInt64> bIndices, Operand<T> bValues,
-      Operand<TInt64> bShape, Operand<U> thresh) {
+  public <T extends TType> SparseAdd<T> sparseAdd(Operand<TInt64> aIndices, Operand<T> aValues,
+      Operand<TInt64> aShape, Operand<TInt64> bIndices, Operand<T> bValues, Operand<TInt64> bShape,
+      Operand<? extends TNumber> thresh) {
     return SparseAdd.create(scope, aIndices, aValues, aShape, bIndices, bValues, bShape, thresh);
   }
 
@@ -753,8 +754,8 @@ public <T extends TType> SparseFillEmptyRowsGrad<T> sparseFillEmptyRowsGrad(
    * @param options carries optional attributes values
    * @return a new instance of SparseMatMul
    */
-  public <T extends TNumber, U extends TNumber> SparseMatMul sparseMatMul(Operand<T> a,
-      Operand<U> b, SparseMatMul.Options... options) {
+  public SparseMatMul sparseMatMul(Operand<? extends TNumber> a, Operand<? extends TNumber> b,
+      SparseMatMul.Options... options) {
     return SparseMatMul.create(scope, a, b, options);
   }
 
@@ -950,8 +951,8 @@ public SparseReshape sparseReshape(Operand<TInt64> inputIndices, Operand<TInt64>
    * @param segmentIds A 1-D tensor. Values should be sorted and can be repeated.
    * @return a new instance of SparseSegmentMean
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentMean<T> sparseSegmentMean(
-      Operand<T> data, Operand<U> indices, Operand<V> segmentIds) {
+  public <T extends TNumber> SparseSegmentMean<T> sparseSegmentMean(Operand<T> data,
+      Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
     return SparseSegmentMean.create(scope, data, indices, segmentIds);
   }
 
@@ -968,8 +969,9 @@ public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentMe
    * @param outputDim0 dimension 0 of "data" passed to SparseSegmentMean op.
    * @return a new instance of SparseSegmentMeanGrad
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentMeanGrad<T> sparseSegmentMeanGrad(
-      Operand<T> grad, Operand<U> indices, Operand<V> segmentIds, Operand<TInt32> outputDim0) {
+  public <T extends TNumber> SparseSegmentMeanGrad<T> sparseSegmentMeanGrad(Operand<T> grad,
+      Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
+      Operand<TInt32> outputDim0) {
     return SparseSegmentMeanGrad.create(scope, grad, indices, segmentIds, outputDim0);
   }
 
@@ -990,8 +992,9 @@ public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentMe
    * @param numSegments Should equal the number of distinct segment IDs.
    * @return a new instance of SparseSegmentMeanWithNumSegments
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber, W extends TNumber> SparseSegmentMeanWithNumSegments<T> sparseSegmentMeanWithNumSegments(
-      Operand<T> data, Operand<U> indices, Operand<V> segmentIds, Operand<W> numSegments) {
+  public <T extends TNumber> SparseSegmentMeanWithNumSegments<T> sparseSegmentMeanWithNumSegments(
+      Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
+      Operand<? extends TNumber> numSegments) {
     return SparseSegmentMeanWithNumSegments.create(scope, data, indices, segmentIds, numSegments);
   }
 
@@ -1008,8 +1011,8 @@ public <T extends TNumber, U extends TNumber, V extends TNumber, W extends TNumb
    * @param segmentIds A 1-D tensor. Values should be sorted and can be repeated.
    * @return a new instance of SparseSegmentSqrtN
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSqrtN<T> sparseSegmentSqrtN(
-      Operand<T> data, Operand<U> indices, Operand<V> segmentIds) {
+  public <T extends TNumber> SparseSegmentSqrtN<T> sparseSegmentSqrtN(Operand<T> data,
+      Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
     return SparseSegmentSqrtN.create(scope, data, indices, segmentIds);
   }
 
@@ -1026,8 +1029,9 @@ public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSq
    * @param outputDim0 dimension 0 of "data" passed to SparseSegmentSqrtN op.
    * @return a new instance of SparseSegmentSqrtNGrad
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSqrtNGrad<T> sparseSegmentSqrtNGrad(
-      Operand<T> grad, Operand<U> indices, Operand<V> segmentIds, Operand<TInt32> outputDim0) {
+  public <T extends TNumber> SparseSegmentSqrtNGrad<T> sparseSegmentSqrtNGrad(Operand<T> grad,
+      Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
+      Operand<TInt32> outputDim0) {
     return SparseSegmentSqrtNGrad.create(scope, grad, indices, segmentIds, outputDim0);
   }
 
@@ -1050,8 +1054,9 @@ public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSq
    * @param numSegments Should equal the number of distinct segment IDs.
    * @return a new instance of SparseSegmentSqrtNWithNumSegments
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber, W extends TNumber> SparseSegmentSqrtNWithNumSegments<T> sparseSegmentSqrtNWithNumSegments(
-      Operand<T> data, Operand<U> indices, Operand<V> segmentIds, Operand<W> numSegments) {
+  public <T extends TNumber> SparseSegmentSqrtNWithNumSegments<T> sparseSegmentSqrtNWithNumSegments(
+      Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
+      Operand<? extends TNumber> numSegments) {
     return SparseSegmentSqrtNWithNumSegments.create(scope, data, indices, segmentIds, numSegments);
   }
 
@@ -1093,8 +1098,8 @@ public <T extends TNumber, U extends TNumber, V extends TNumber, W extends TNumb
    * @param segmentIds A 1-D tensor. Values should be sorted and can be repeated.
    * @return a new instance of SparseSegmentSum
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSum<T> sparseSegmentSum(
-      Operand<T> data, Operand<U> indices, Operand<V> segmentIds) {
+  public <T extends TNumber> SparseSegmentSum<T> sparseSegmentSum(Operand<T> data,
+      Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
     return SparseSegmentSum.create(scope, data, indices, segmentIds);
   }
 
@@ -1135,8 +1140,9 @@ public <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSu
    * @param numSegments Should equal the number of distinct segment IDs.
    * @return a new instance of SparseSegmentSumWithNumSegments
    */
-  public <T extends TNumber, U extends TNumber, V extends TNumber, W extends TNumber> SparseSegmentSumWithNumSegments<T> sparseSegmentSumWithNumSegments(
-      Operand<T> data, Operand<U> indices, Operand<V> segmentIds, Operand<W> numSegments) {
+  public <T extends TNumber> SparseSegmentSumWithNumSegments<T> sparseSegmentSumWithNumSegments(
+      Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
+      Operand<? extends TNumber> numSegments) {
     return SparseSegmentSumWithNumSegments.create(scope, data, indices, segmentIds, numSegments);
   }
 
@@ -1342,8 +1348,8 @@ public <U extends TType, T extends TNumber> SparseTensorDenseAdd<U> sparseTensor
    * @param options carries optional attributes values
    * @return a new instance of SparseTensorDenseMatMul
    */
-  public <U extends TType, T extends TNumber> SparseTensorDenseMatMul<U> sparseTensorDenseMatMul(
-      Operand<T> aIndices, Operand<U> aValues, Operand<TInt64> aShape, Operand<U> b,
+  public <U extends TType> SparseTensorDenseMatMul<U> sparseTensorDenseMatMul(
+      Operand<? extends TNumber> aIndices, Operand<U> aValues, Operand<TInt64> aShape, Operand<U> b,
       SparseTensorDenseMatMul.Options... options) {
     return SparseTensorDenseMatMul.create(scope, aIndices, aValues, aShape, b, options);
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/StringsOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/StringsOps.java
index 6d380c31bc6..d2527c6563f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/StringsOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/StringsOps.java
@@ -597,8 +597,8 @@ public UnicodeTranscode unicodeTranscode(Operand<TString> input, String inputEnc
    * @param options carries optional attributes values
    * @return a new instance of UnsortedSegmentJoin
    */
-  public <T extends TNumber, U extends TNumber> UnsortedSegmentJoin unsortedSegmentJoin(
-      Operand<TString> inputs, Operand<T> segmentIds, Operand<U> numSegments,
+  public UnsortedSegmentJoin unsortedSegmentJoin(Operand<TString> inputs,
+      Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments,
       UnsortedSegmentJoin.Options... options) {
     return UnsortedSegmentJoin.create(scope, inputs, segmentIds, numSegments, options);
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SummaryOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SummaryOps.java
index 83423d50121..5366744fcae 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SummaryOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SummaryOps.java
@@ -86,8 +86,8 @@ public AudioSummary audioSummary(Operand<TString> tag, Operand<TFloat32> tensor,
    * @param values Any shape. Values to use to build the histogram.
    * @return a new instance of HistogramSummary
    */
-  public <T extends TNumber> HistogramSummary histogramSummary(Operand<TString> tag,
-      Operand<T> values) {
+  public HistogramSummary histogramSummary(Operand<TString> tag,
+      Operand<? extends TNumber> values) {
     return HistogramSummary.create(scope, tag, values);
   }
 
@@ -147,7 +147,7 @@ public <T extends TNumber> HistogramSummary histogramSummary(Operand<TString> ta
    * @param options carries optional attributes values
    * @return a new instance of ImageSummary
    */
-  public <T extends TNumber> ImageSummary imageSummary(Operand<TString> tag, Operand<T> tensor,
+  public ImageSummary imageSummary(Operand<TString> tag, Operand<? extends TNumber> tensor,
       ImageSummary.Options... options) {
     return ImageSummary.create(scope, tag, tensor, options);
   }
@@ -181,7 +181,7 @@ public MergeSummary mergeSummary(Iterable<Operand<TString>> inputs) {
    * @param values Same shape as `tags.  Values for the summary.
    * @return a new instance of ScalarSummary
    */
-  public <T extends TNumber> ScalarSummary scalarSummary(Operand<TString> tags, Operand<T> values) {
+  public ScalarSummary scalarSummary(Operand<TString> tags, Operand<? extends TNumber> values) {
     return ScalarSummary.create(scope, tags, values);
   }
 
@@ -194,7 +194,7 @@ public <T extends TNumber> ScalarSummary scalarSummary(Operand<TString> tags, Op
    *  data.
    * @return a new instance of TensorSummary
    */
-  public <T extends TType> TensorSummary tensorSummary(Operand<TString> tag, Operand<T> tensor,
+  public TensorSummary tensorSummary(Operand<TString> tag, Operand<? extends TType> tensor,
       Operand<TString> serializedSummaryMetadata) {
     return TensorSummary.create(scope, tag, tensor, serializedSummaryMetadata);
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TrainOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TrainOps.java
index d21b5e037d3..87809e1a4c3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TrainOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TrainOps.java
@@ -114,8 +114,8 @@ public final class TrainOps {
    * @param gradient A tensor of the gradient to be accumulated.
    * @return a new instance of AccumulatorApplyGradient
    */
-  public <T extends TType> AccumulatorApplyGradient accumulatorApplyGradient(
-      Operand<TString> handle, Operand<TInt64> localStep, Operand<T> gradient) {
+  public AccumulatorApplyGradient accumulatorApplyGradient(Operand<TString> handle,
+      Operand<TInt64> localStep, Operand<? extends TType> gradient) {
     return AccumulatorApplyGradient.create(scope, handle, localStep, gradient);
   }
 
@@ -1019,9 +1019,9 @@ public <T extends TType> ResourceApplyRmsProp resourceApplyRmsProp(Operand<?> va
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyAdadelta
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyAdadelta resourceSparseApplyAdadelta(
-      Operand<?> var, Operand<?> accum, Operand<?> accumUpdate, Operand<T> lr, Operand<T> rho,
-      Operand<T> epsilon, Operand<T> grad, Operand<U> indices,
+  public <T extends TType> ResourceSparseApplyAdadelta resourceSparseApplyAdadelta(Operand<?> var,
+      Operand<?> accum, Operand<?> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon,
+      Operand<T> grad, Operand<? extends TNumber> indices,
       ResourceSparseApplyAdadelta.Options... options) {
     return ResourceSparseApplyAdadelta.create(scope, var, accum, accumUpdate, lr, rho, epsilon, grad, indices, options);
   }
@@ -1041,8 +1041,8 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyAdadelta resource
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyAdagrad
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyAdagrad resourceSparseApplyAdagrad(
-      Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<U> indices,
+  public <T extends TType> ResourceSparseApplyAdagrad resourceSparseApplyAdagrad(Operand<?> var,
+      Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<? extends TNumber> indices,
       ResourceSparseApplyAdagrad.Options... options) {
     return ResourceSparseApplyAdagrad.create(scope, var, accum, lr, grad, indices, options);
   }
@@ -1062,9 +1062,9 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyAdagrad resourceS
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyAdagradDa
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyAdagradDa resourceSparseApplyAdagradDa(
-      Operand<?> var, Operand<?> gradientAccumulator, Operand<?> gradientSquaredAccumulator,
-      Operand<T> grad, Operand<U> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2,
+  public <T extends TType> ResourceSparseApplyAdagradDa resourceSparseApplyAdagradDa(Operand<?> var,
+      Operand<?> gradientAccumulator, Operand<?> gradientSquaredAccumulator, Operand<T> grad,
+      Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2,
       Operand<TInt64> globalStep, ResourceSparseApplyAdagradDa.Options... options) {
     return ResourceSparseApplyAdagradDa.create(scope, var, gradientAccumulator, gradientSquaredAccumulator, grad, indices, lr, l1, l2, globalStep, options);
   }
@@ -1102,9 +1102,9 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyAdagradDa resourc
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyCenteredRmsProp
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyCenteredRmsProp resourceSparseApplyCenteredRmsProp(
+  public <T extends TType> ResourceSparseApplyCenteredRmsProp resourceSparseApplyCenteredRmsProp(
       Operand<?> var, Operand<?> mg, Operand<?> ms, Operand<?> mom, Operand<T> lr, Operand<T> rho,
-      Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<U> indices,
+      Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices,
       ResourceSparseApplyCenteredRmsProp.Options... options) {
     return ResourceSparseApplyCenteredRmsProp.create(scope, var, mg, ms, mom, lr, rho, momentum, epsilon, grad, indices, options);
   }
@@ -1134,8 +1134,8 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyCenteredRmsProp r
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyFtrl
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyFtrl resourceSparseApplyFtrl(
-      Operand<?> var, Operand<?> accum, Operand<?> linear, Operand<T> grad, Operand<U> indices,
+  public <T extends TType> ResourceSparseApplyFtrl resourceSparseApplyFtrl(Operand<?> var,
+      Operand<?> accum, Operand<?> linear, Operand<T> grad, Operand<? extends TNumber> indices,
       Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> l2Shrinkage, Operand<T> lrPower,
       ResourceSparseApplyFtrl.Options... options) {
     return ResourceSparseApplyFtrl.create(scope, var, accum, linear, grad, indices, lr, l1, l2, l2Shrinkage, lrPower, options);
@@ -1160,9 +1160,10 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyFtrl resourceSpar
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyKerasMomentum
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyKerasMomentum resourceSparseApplyKerasMomentum(
-      Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<U> indices,
-      Operand<T> momentum, ResourceSparseApplyKerasMomentum.Options... options) {
+  public <T extends TType> ResourceSparseApplyKerasMomentum resourceSparseApplyKerasMomentum(
+      Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad,
+      Operand<? extends TNumber> indices, Operand<T> momentum,
+      ResourceSparseApplyKerasMomentum.Options... options) {
     return ResourceSparseApplyKerasMomentum.create(scope, var, accum, lr, grad, indices, momentum, options);
   }
 
@@ -1185,8 +1186,8 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyKerasMomentum res
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyMomentum
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyMomentum resourceSparseApplyMomentum(
-      Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<U> indices,
+  public <T extends TType> ResourceSparseApplyMomentum resourceSparseApplyMomentum(Operand<?> var,
+      Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<? extends TNumber> indices,
       Operand<T> momentum, ResourceSparseApplyMomentum.Options... options) {
     return ResourceSparseApplyMomentum.create(scope, var, accum, lr, grad, indices, momentum, options);
   }
@@ -1210,9 +1211,10 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyMomentum resource
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyProximalAdagrad
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyProximalAdagrad resourceSparseApplyProximalAdagrad(
+  public <T extends TType> ResourceSparseApplyProximalAdagrad resourceSparseApplyProximalAdagrad(
       Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2,
-      Operand<T> grad, Operand<U> indices, ResourceSparseApplyProximalAdagrad.Options... options) {
+      Operand<T> grad, Operand<? extends TNumber> indices,
+      ResourceSparseApplyProximalAdagrad.Options... options) {
     return ResourceSparseApplyProximalAdagrad.create(scope, var, accum, lr, l1, l2, grad, indices, options);
   }
 
@@ -1232,9 +1234,10 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyProximalAdagrad r
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyProximalGradientDescent
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyProximalGradientDescent resourceSparseApplyProximalGradientDescent(
+  public <T extends TType> ResourceSparseApplyProximalGradientDescent resourceSparseApplyProximalGradientDescent(
       Operand<?> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> grad,
-      Operand<U> indices, ResourceSparseApplyProximalGradientDescent.Options... options) {
+      Operand<? extends TNumber> indices,
+      ResourceSparseApplyProximalGradientDescent.Options... options) {
     return ResourceSparseApplyProximalGradientDescent.create(scope, var, alpha, l1, l2, grad, indices, options);
   }
 
@@ -1264,9 +1267,9 @@ public <T extends TType, U extends TNumber> ResourceSparseApplyProximalGradientD
    * @param options carries optional attributes values
    * @return a new instance of ResourceSparseApplyRmsProp
    */
-  public <T extends TType, U extends TNumber> ResourceSparseApplyRmsProp resourceSparseApplyRmsProp(
-      Operand<?> var, Operand<?> ms, Operand<?> mom, Operand<T> lr, Operand<T> rho,
-      Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<U> indices,
+  public <T extends TType> ResourceSparseApplyRmsProp resourceSparseApplyRmsProp(Operand<?> var,
+      Operand<?> ms, Operand<?> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum,
+      Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices,
       ResourceSparseApplyRmsProp.Options... options) {
     return ResourceSparseApplyRmsProp.create(scope, var, ms, mom, lr, rho, momentum, epsilon, grad, indices, options);
   }
@@ -1432,10 +1435,9 @@ public SdcaShrinkL1 sdcaShrinkL1(Iterable<Operand<TFloat32>> weights, Float l1,
    * @param options carries optional attributes values
    * @return a new instance of SparseApplyAdadelta
    */
-  public <T extends TType, U extends TNumber> SparseApplyAdadelta<T> sparseApplyAdadelta(
-      Operand<T> var, Operand<T> accum, Operand<T> accumUpdate, Operand<T> lr, Operand<T> rho,
-      Operand<T> epsilon, Operand<T> grad, Operand<U> indices,
-      SparseApplyAdadelta.Options... options) {
+  public <T extends TType> SparseApplyAdadelta<T> sparseApplyAdadelta(Operand<T> var,
+      Operand<T> accum, Operand<T> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon,
+      Operand<T> grad, Operand<? extends TNumber> indices, SparseApplyAdadelta.Options... options) {
     return SparseApplyAdadelta.create(scope, var, accum, accumUpdate, lr, rho, epsilon, grad, indices, options);
   }
 
@@ -1455,9 +1457,9 @@ public <T extends TType, U extends TNumber> SparseApplyAdadelta<T> sparseApplyAd
    * @param options carries optional attributes values
    * @return a new instance of SparseApplyAdagradDa
    */
-  public <T extends TType, U extends TNumber> SparseApplyAdagradDa<T> sparseApplyAdagradDa(
-      Operand<T> var, Operand<T> gradientAccumulator, Operand<T> gradientSquaredAccumulator,
-      Operand<T> grad, Operand<U> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2,
+  public <T extends TType> SparseApplyAdagradDa<T> sparseApplyAdagradDa(Operand<T> var,
+      Operand<T> gradientAccumulator, Operand<T> gradientSquaredAccumulator, Operand<T> grad,
+      Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2,
       Operand<TInt64> globalStep, SparseApplyAdagradDa.Options... options) {
     return SparseApplyAdagradDa.create(scope, var, gradientAccumulator, gradientSquaredAccumulator, grad, indices, lr, l1, l2, globalStep, options);
   }
@@ -1496,9 +1498,9 @@ public <T extends TType, U extends TNumber> SparseApplyAdagradDa<T> sparseApplyA
    * @param options carries optional attributes values
    * @return a new instance of SparseApplyCenteredRmsProp
    */
-  public <T extends TType, U extends TNumber> SparseApplyCenteredRmsProp<T> sparseApplyCenteredRmsProp(
-      Operand<T> var, Operand<T> mg, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho,
-      Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<U> indices,
+  public <T extends TType> SparseApplyCenteredRmsProp<T> sparseApplyCenteredRmsProp(Operand<T> var,
+      Operand<T> mg, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho,
+      Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices,
       SparseApplyCenteredRmsProp.Options... options) {
     return SparseApplyCenteredRmsProp.create(scope, var, mg, ms, mom, lr, rho, momentum, epsilon, grad, indices, options);
   }
@@ -1529,8 +1531,8 @@ public <T extends TType, U extends TNumber> SparseApplyCenteredRmsProp<T> sparse
    * @param options carries optional attributes values
    * @return a new instance of SparseApplyFtrl
    */
-  public <T extends TType, U extends TNumber> SparseApplyFtrl<T> sparseApplyFtrl(Operand<T> var,
-      Operand<T> accum, Operand<T> linear, Operand<T> grad, Operand<U> indices, Operand<T> lr,
+  public <T extends TType> SparseApplyFtrl<T> sparseApplyFtrl(Operand<T> var, Operand<T> accum,
+      Operand<T> linear, Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> lr,
       Operand<T> l1, Operand<T> l2, Operand<T> l2Shrinkage, Operand<T> lrPower,
       SparseApplyFtrl.Options... options) {
     return SparseApplyFtrl.create(scope, var, accum, linear, grad, indices, lr, l1, l2, l2Shrinkage, lrPower, options);
@@ -1556,8 +1558,8 @@ public <T extends TType, U extends TNumber> SparseApplyFtrl<T> sparseApplyFtrl(O
    * @param options carries optional attributes values
    * @return a new instance of SparseApplyMomentum
    */
-  public <T extends TType, U extends TNumber> SparseApplyMomentum<T> sparseApplyMomentum(
-      Operand<T> var, Operand<T> accum, Operand<T> lr, Operand<T> grad, Operand<U> indices,
+  public <T extends TType> SparseApplyMomentum<T> sparseApplyMomentum(Operand<T> var,
+      Operand<T> accum, Operand<T> lr, Operand<T> grad, Operand<? extends TNumber> indices,
       Operand<T> momentum, SparseApplyMomentum.Options... options) {
     return SparseApplyMomentum.create(scope, var, accum, lr, grad, indices, momentum, options);
   }
@@ -1582,9 +1584,9 @@ public <T extends TType, U extends TNumber> SparseApplyMomentum<T> sparseApplyMo
    * @param options carries optional attributes values
    * @return a new instance of SparseApplyProximalAdagrad
    */
-  public <T extends TType, U extends TNumber> SparseApplyProximalAdagrad<T> sparseApplyProximalAdagrad(
-      Operand<T> var, Operand<T> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2,
-      Operand<T> grad, Operand<U> indices, SparseApplyProximalAdagrad.Options... options) {
+  public <T extends TType> SparseApplyProximalAdagrad<T> sparseApplyProximalAdagrad(Operand<T> var,
+      Operand<T> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> grad,
+      Operand<? extends TNumber> indices, SparseApplyProximalAdagrad.Options... options) {
     return SparseApplyProximalAdagrad.create(scope, var, accum, lr, l1, l2, grad, indices, options);
   }
 
@@ -1605,9 +1607,9 @@ public <T extends TType, U extends TNumber> SparseApplyProximalAdagrad<T> sparse
    * @param options carries optional attributes values
    * @return a new instance of SparseApplyProximalGradientDescent
    */
-  public <T extends TType, U extends TNumber> SparseApplyProximalGradientDescent<T> sparseApplyProximalGradientDescent(
+  public <T extends TType> SparseApplyProximalGradientDescent<T> sparseApplyProximalGradientDescent(
       Operand<T> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> grad,
-      Operand<U> indices, SparseApplyProximalGradientDescent.Options... options) {
+      Operand<? extends TNumber> indices, SparseApplyProximalGradientDescent.Options... options) {
     return SparseApplyProximalGradientDescent.create(scope, var, alpha, l1, l2, grad, indices, options);
   }
 
@@ -1638,10 +1640,9 @@ public <T extends TType, U extends TNumber> SparseApplyProximalGradientDescent<T
    * @param options carries optional attributes values
    * @return a new instance of SparseApplyRmsProp
    */
-  public <T extends TType, U extends TNumber> SparseApplyRmsProp<T> sparseApplyRmsProp(
-      Operand<T> var, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho,
-      Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<U> indices,
-      SparseApplyRmsProp.Options... options) {
+  public <T extends TType> SparseApplyRmsProp<T> sparseApplyRmsProp(Operand<T> var, Operand<T> ms,
+      Operand<T> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon,
+      Operand<T> grad, Operand<? extends TNumber> indices, SparseApplyRmsProp.Options... options) {
     return SparseApplyRmsProp.create(scope, var, ms, mom, lr, rho, momentum, epsilon, grad, indices, options);
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/XlaOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/XlaOps.java
index 4c8df665739..d4e9c94d250 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/XlaOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/XlaOps.java
@@ -68,8 +68,8 @@ public final class XlaOps {
    * @param broadcastDims an XLA-style broadcast dimension specification
    * @return a new instance of BroadcastHelper
    */
-  public <T extends TType, U extends TNumber> BroadcastHelper<T> broadcastHelper(Operand<T> lhs,
-      Operand<T> rhs, Operand<U> broadcastDims) {
+  public <T extends TType> BroadcastHelper<T> broadcastHelper(Operand<T> lhs, Operand<T> rhs,
+      Operand<? extends TNumber> broadcastDims) {
     return BroadcastHelper.create(scope, lhs, rhs, broadcastDims);
   }
 
@@ -190,8 +190,8 @@ public <T extends TType, U extends TNumber> DynamicSlice<T> dynamicSlice(Operand
    *  `input`.
    * @return a new instance of DynamicUpdateSlice
    */
-  public <T extends TType, U extends TNumber> DynamicUpdateSlice<T> dynamicUpdateSlice(
-      Operand<T> input, Operand<T> update, Operand<U> indices) {
+  public <T extends TType> DynamicUpdateSlice<T> dynamicUpdateSlice(Operand<T> input,
+      Operand<T> update, Operand<? extends TNumber> indices) {
     return DynamicUpdateSlice.create(scope, input, update, indices);
   }
 
@@ -328,7 +328,7 @@ public <T extends TType> SelfAdjointEig<T> selfAdjointEig(Operand<T> a, Boolean
    * @param tensorName A string key that identifies the channel.
    * @return a new instance of Send
    */
-  public <T extends TType> Send send(Operand<T> tensor, String tensorName) {
+  public Send send(Operand<? extends TType> tensor, String tensorName) {
     return Send.create(scope, tensor, tensorName);
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java
index 17b3a3bf0c3..c0d9108cc7f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java
@@ -69,7 +69,7 @@ private Options() {
    * @return a new instance of All
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> All create(Scope scope, Operand<TBool> input, Operand<T> axis, Options... options) {
+  public static All create(Scope scope, Operand<TBool> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("All", scope.makeOpName("All"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java
index 85a60f6b2e0..d9b339923a0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java
@@ -69,7 +69,7 @@ private Options() {
    * @return a new instance of Any
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> Any create(Scope scope, Operand<TBool> input, Operand<T> axis, Options... options) {
+  public static Any create(Scope scope, Operand<TBool> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Any", scope.makeOpName("Any"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java
index 58d7ed3ca45..6bb441bd9c7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java
@@ -44,7 +44,7 @@ public final class AssignAddVariableOp extends RawOp {
    * @return a new instance of AssignAddVariableOp
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> AssignAddVariableOp create(Scope scope, Operand<?> resource, Operand<T> value) {
+  public static AssignAddVariableOp create(Scope scope, Operand<?> resource, Operand<? extends TType> value) {
     OperationBuilder opBuilder = scope.env().opBuilder("AssignAddVariableOp", scope.makeOpName("AssignAddVariableOp"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(value.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java
index a7868911c52..dc2ce281c7e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java
@@ -44,7 +44,7 @@ public final class AssignSubVariableOp extends RawOp {
    * @return a new instance of AssignSubVariableOp
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> AssignSubVariableOp create(Scope scope, Operand<?> resource, Operand<T> value) {
+  public static AssignSubVariableOp create(Scope scope, Operand<?> resource, Operand<? extends TType> value) {
     OperationBuilder opBuilder = scope.env().opBuilder("AssignSubVariableOp", scope.makeOpName("AssignSubVariableOp"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(value.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java
index e2ea7b0b524..4fd1a56a06f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java
@@ -44,7 +44,7 @@ public final class AssignVariableOp extends RawOp {
    * @return a new instance of AssignVariableOp
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> AssignVariableOp create(Scope scope, Operand<?> resource, Operand<T> value) {
+  public static AssignVariableOp create(Scope scope, Operand<?> resource, Operand<? extends TType> value) {
     OperationBuilder opBuilder = scope.env().opBuilder("AssignVariableOp", scope.makeOpName("AssignVariableOp"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(value.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java
index ccb8c6da826..5bd70a0a197 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java
@@ -50,7 +50,7 @@ public final class BarrierInsertMany extends RawOp {
    * @return a new instance of BarrierInsertMany
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> BarrierInsertMany create(Scope scope, Operand<TString> handle, Operand<TString> keys, Operand<T> values, Long componentIndex) {
+  public static BarrierInsertMany create(Scope scope, Operand<TString> handle, Operand<TString> keys, Operand<? extends TType> values, Long componentIndex) {
     OperationBuilder opBuilder = scope.env().opBuilder("BarrierInsertMany", scope.makeOpName("BarrierInsertMany"));
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(keys.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java
index 0700ca1efd8..bf5100836e8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java
@@ -61,7 +61,7 @@ public final class BatchToSpace<T extends TType> extends RawOp implements Operan
    * @return a new instance of BatchToSpace
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> BatchToSpace<T> create(Scope scope, Operand<T> input, Operand<U> crops, Long blockSize) {
+  public static <T extends TType> BatchToSpace<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> crops, Long blockSize) {
     OperationBuilder opBuilder = scope.env().opBuilder("BatchToSpace", scope.makeOpName("BatchToSpace"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(crops.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java
index 3c56135aa37..1890b0e5d54 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java
@@ -148,7 +148,7 @@ public final class BatchToSpaceNd<T extends TType> extends RawOp implements Oper
    * @return a new instance of BatchToSpaceNd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber, V extends TNumber> BatchToSpaceNd<T> create(Scope scope, Operand<T> input, Operand<U> blockShape, Operand<V> crops) {
+  public static <T extends TType> BatchToSpaceNd<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> blockShape, Operand<? extends TNumber> crops) {
     OperationBuilder opBuilder = scope.env().opBuilder("BatchToSpaceND", scope.makeOpName("BatchToSpaceNd"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(blockShape.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java
index 04ea83cf3be..e9176b8dd99 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java
@@ -96,7 +96,7 @@ public final class Bitcast<U extends TType> extends RawOp implements Operand<U>
    * @return a new instance of Bitcast
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> Bitcast<U> create(Scope scope, Operand<T> input, Class<U> type) {
+  public static <U extends TType> Bitcast<U> create(Scope scope, Operand<? extends TType> input, Class<U> type) {
     OperationBuilder opBuilder = scope.env().opBuilder("Bitcast", scope.makeOpName("Bitcast"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java
index de9b4ee7c88..5cdf860d611 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java
@@ -73,7 +73,7 @@ public final class BroadcastTo<T extends TType> extends RawOp implements Operand
    * @return a new instance of BroadcastTo
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> BroadcastTo<T> create(Scope scope, Operand<T> input, Operand<U> shape) {
+  public static <T extends TType> BroadcastTo<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> shape) {
     OperationBuilder opBuilder = scope.env().opBuilder("BroadcastTo", scope.makeOpName("BroadcastTo"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(shape.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java
index 87197f19c3d..355c7b7a46e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java
@@ -55,7 +55,7 @@ public final class Bucketize extends RawOp implements Operand<TInt32> {
    * @return a new instance of Bucketize
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> Bucketize create(Scope scope, Operand<T> input, List<Float> boundaries) {
+  public static Bucketize create(Scope scope, Operand<? extends TNumber> input, List<Float> boundaries) {
     OperationBuilder opBuilder = scope.env().opBuilder("Bucketize", scope.makeOpName("Bucketize"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java
index 33723c7c364..279ae8e4b2f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java
@@ -48,7 +48,7 @@ public final class Concat<T extends TType> extends RawOp implements Operand<T> {
    * @return a new instance of Concat
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Concat<T> create(Scope scope, Iterable<Operand<T>> values, Operand<U> axis) {
+  public static <T extends TType> Concat<T> create(Scope scope, Iterable<Operand<T>> values, Operand<? extends TNumber> axis) {
     OperationBuilder opBuilder = scope.env().opBuilder("ConcatV2", scope.makeOpName("Concat"));
     opBuilder.addInputList(Operands.asOutputs(values));
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummySeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummySeedGenerator.java
deleted file mode 100644
index 832887f1950..00000000000
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummySeedGenerator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-=======================================================================*/
-
-// This class has been generated, DO NOT EDIT!
-
-package org.tensorflow.op.core;
-
-import org.tensorflow.Operand;
-import org.tensorflow.Operation;
-import org.tensorflow.OperationBuilder;
-import org.tensorflow.Output;
-import org.tensorflow.op.RawOp;
-import org.tensorflow.op.Scope;
-import org.tensorflow.op.annotation.Endpoint;
-import org.tensorflow.types.family.TType;
-
-/**
- */
-public final class DummySeedGenerator extends RawOp implements Operand<TType> {
-  
-  /**
-   * Factory method to create a class wrapping a new DummySeedGenerator operation.
-   * 
-   * @param scope current scope
-   * @return a new instance of DummySeedGenerator
-   */
-  @Endpoint(describeByClass = true)
-  public static DummySeedGenerator create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder("DummySeedGenerator", scope.makeOpName("DummySeedGenerator"));
-    opBuilder = scope.apply(opBuilder);
-    return new DummySeedGenerator(opBuilder.build());
-  }
-  
-  /**
-   */
-  public Output<?> handle() {
-    return handle;
-  }
-  
-  @Override
-  @SuppressWarnings("unchecked")
-  public Output<TType> asOutput() {
-    return (Output<TType>) handle;
-  }
-  
-  private Output<?> handle;
-  
-  private DummySeedGenerator(Operation operation) {
-    super(operation);
-    int outputIdx = 0;
-    handle = operation.output(outputIdx++);
-  }
-}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java
index e5ec261e5b8..db314701fe6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java
@@ -53,7 +53,7 @@ public final class EmptyTensorList extends RawOp implements Operand<TType> {
    * @return a new instance of EmptyTensorList
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> EmptyTensorList create(Scope scope, Operand<T> elementShape, Operand<TInt32> maxNumElements, Class<U> elementDtype) {
+  public static <U extends TType> EmptyTensorList create(Scope scope, Operand<? extends TNumber> elementShape, Operand<TInt32> maxNumElements, Class<U> elementDtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("EmptyTensorList", scope.makeOpName("EmptyTensorList"));
     opBuilder.addInput(elementShape.asOutput());
     opBuilder.addInput(maxNumElements.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java
index 9f94e27b7f0..c80e1809420 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java
@@ -76,7 +76,7 @@ public final class ExpandDims<T extends TType> extends RawOp implements Operand<
    * @return a new instance of ExpandDims
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ExpandDims<T> create(Scope scope, Operand<T> input, Operand<U> axis) {
+  public static <T extends TType> ExpandDims<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis) {
     OperationBuilder opBuilder = scope.env().opBuilder("ExpandDims", scope.makeOpName("ExpandDims"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java
index 9f79df9c99b..fac22b5f885 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java
@@ -72,7 +72,7 @@ public final class Fill<U extends TType> extends RawOp implements Operand<U> {
    * @return a new instance of Fill
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> Fill<U> create(Scope scope, Operand<T> dims, Operand<U> value) {
+  public static <U extends TType> Fill<U> create(Scope scope, Operand<? extends TNumber> dims, Operand<U> value) {
     OperationBuilder opBuilder = scope.env().opBuilder("Fill", scope.makeOpName("Fill"));
     opBuilder.addInput(dims.asOutput());
     opBuilder.addInput(value.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java
index 2bd330c9293..5911fa07e40 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java
@@ -74,7 +74,7 @@ public final class Fingerprint extends RawOp implements Operand<TUint8> {
    * @return a new instance of Fingerprint
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Fingerprint create(Scope scope, Operand<T> data, Operand<TString> method) {
+  public static Fingerprint create(Scope scope, Operand<? extends TType> data, Operand<TString> method) {
     OperationBuilder opBuilder = scope.env().opBuilder("Fingerprint", scope.makeOpName("Fingerprint"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(method.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java
index 358a5dbfab0..e4a366d96f3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java
@@ -94,7 +94,7 @@ private Options() {
    * @return a new instance of Gather
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber, V extends TNumber> Gather<T> create(Scope scope, Operand<T> params, Operand<U> indices, Operand<V> axis, Options... options) {
+  public static <T extends TType> Gather<T> create(Scope scope, Operand<T> params, Operand<? extends TNumber> indices, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("GatherV2", scope.makeOpName("Gather"));
     opBuilder.addInput(params.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java
index 1bf4500fd75..d7a5fa04b7e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java
@@ -138,7 +138,7 @@ public final class GatherNd<T extends TType> extends RawOp implements Operand<T>
    * @return a new instance of GatherNd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> GatherNd<T> create(Scope scope, Operand<T> params, Operand<U> indices) {
+  public static <T extends TType> GatherNd<T> create(Scope scope, Operand<T> params, Operand<? extends TNumber> indices) {
     OperationBuilder opBuilder = scope.env().opBuilder("GatherNd", scope.makeOpName("GatherNd"));
     opBuilder.addInput(params.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java
index b03925faa4e..e3a46804398 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java
@@ -41,7 +41,7 @@ public final class GetSessionHandle extends RawOp implements Operand<TType> {
    * @return a new instance of GetSessionHandle
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> GetSessionHandle create(Scope scope, Operand<T> value) {
+  public static GetSessionHandle create(Scope scope, Operand<? extends TType> value) {
     OperationBuilder opBuilder = scope.env().opBuilder("GetSessionHandleV2", scope.makeOpName("GetSessionHandle"));
     opBuilder.addInput(value.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java
index d08f66042a6..d873004b378 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java
@@ -42,7 +42,7 @@ public final class InitializeTable extends RawOp {
    * @return a new instance of InitializeTable
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TType> InitializeTable create(Scope scope, Operand<?> tableHandle, Operand<T> keys, Operand<U> values) {
+  public static InitializeTable create(Scope scope, Operand<?> tableHandle, Operand<? extends TType> keys, Operand<? extends TType> values) {
     OperationBuilder opBuilder = scope.env().opBuilder("InitializeTableV2", scope.makeOpName("InitializeTable"));
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java
index 7fdf0ee33ee..aea759600e0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java
@@ -44,7 +44,7 @@ public final class IsVariableInitialized extends RawOp implements Operand<TBool>
    * @return a new instance of IsVariableInitialized
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> IsVariableInitialized create(Scope scope, Operand<T> ref) {
+  public static IsVariableInitialized create(Scope scope, Operand<? extends TType> ref) {
     OperationBuilder opBuilder = scope.env().opBuilder("IsVariableInitialized", scope.makeOpName("IsVariableInitialized"));
     opBuilder.addInput(ref.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java
index 29662e643f8..086bd32278d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java
@@ -54,7 +54,7 @@ public final class LinSpace<T extends TNumber> extends RawOp implements Operand<
    * @return a new instance of LinSpace
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> LinSpace<T> create(Scope scope, Operand<T> start, Operand<T> stop, Operand<U> num) {
+  public static <T extends TNumber> LinSpace<T> create(Scope scope, Operand<T> start, Operand<T> stop, Operand<? extends TNumber> num) {
     OperationBuilder opBuilder = scope.env().opBuilder("LinSpace", scope.makeOpName("LinSpace"));
     opBuilder.addInput(start.asOutput());
     opBuilder.addInput(stop.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java
index 8500e2c3cab..930f30b8ea7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java
@@ -51,7 +51,7 @@ public final class LookupTableFind<U extends TType> extends RawOp implements Ope
    * @return a new instance of LookupTableFind
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> LookupTableFind<U> create(Scope scope, Operand<?> tableHandle, Operand<T> keys, Operand<U> defaultValue) {
+  public static <U extends TType> LookupTableFind<U> create(Scope scope, Operand<?> tableHandle, Operand<? extends TType> keys, Operand<U> defaultValue) {
     OperationBuilder opBuilder = scope.env().opBuilder("LookupTableFindV2", scope.makeOpName("LookupTableFind"));
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java
index c8553c28569..b7957c394ce 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java
@@ -45,7 +45,7 @@ public final class LookupTableImport extends RawOp {
    * @return a new instance of LookupTableImport
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TType> LookupTableImport create(Scope scope, Operand<?> tableHandle, Operand<T> keys, Operand<U> values) {
+  public static LookupTableImport create(Scope scope, Operand<?> tableHandle, Operand<? extends TType> keys, Operand<? extends TType> values) {
     OperationBuilder opBuilder = scope.env().opBuilder("LookupTableImportV2", scope.makeOpName("LookupTableImport"));
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java
index 827d0f9509e..c444db4fe52 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java
@@ -45,7 +45,7 @@ public final class LookupTableInsert extends RawOp {
    * @return a new instance of LookupTableInsert
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TType> LookupTableInsert create(Scope scope, Operand<?> tableHandle, Operand<T> keys, Operand<U> values) {
+  public static LookupTableInsert create(Scope scope, Operand<?> tableHandle, Operand<? extends TType> keys, Operand<? extends TType> values) {
     OperationBuilder opBuilder = scope.env().opBuilder("LookupTableInsertV2", scope.makeOpName("LookupTableInsert"));
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java
index 577c762e385..2965fd839da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java
@@ -43,7 +43,7 @@ public final class LookupTableRemove extends RawOp {
    * @return a new instance of LookupTableRemove
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> LookupTableRemove create(Scope scope, Operand<?> tableHandle, Operand<T> keys) {
+  public static LookupTableRemove create(Scope scope, Operand<?> tableHandle, Operand<? extends TType> keys) {
     OperationBuilder opBuilder = scope.env().opBuilder("LookupTableRemoveV2", scope.makeOpName("LookupTableRemove"));
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java
index 1ed2095c8c5..690767e561a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of Max
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Max<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> Max<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Max", scope.makeOpName("Max"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java
index dc491611bc4..bc06376c01f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of Min
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Min<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> Min<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Min", scope.makeOpName("Min"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java
index fc875c50e29..717a77c7a6a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java
@@ -77,7 +77,7 @@ public final class MirrorPad<T extends TType> extends RawOp implements Operand<T
    * @return a new instance of MirrorPad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> MirrorPad<T> create(Scope scope, Operand<T> input, Operand<U> paddings, String mode) {
+  public static <T extends TType> MirrorPad<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> paddings, String mode) {
     OperationBuilder opBuilder = scope.env().opBuilder("MirrorPad", scope.makeOpName("MirrorPad"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java
index 5d8b1b19b71..901620aa27d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java
@@ -65,7 +65,7 @@ public final class MirrorPadGrad<T extends TType> extends RawOp implements Opera
    * @return a new instance of MirrorPadGrad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> MirrorPadGrad<T> create(Scope scope, Operand<T> input, Operand<U> paddings, String mode) {
+  public static <T extends TType> MirrorPadGrad<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> paddings, String mode) {
     OperationBuilder opBuilder = scope.env().opBuilder("MirrorPadGrad", scope.makeOpName("MirrorPadGrad"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java
index ab4e675613e..46e82fd3b41 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java
@@ -149,7 +149,7 @@ private Options() {
    * @return a new instance of OneHot
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> OneHot<U> create(Scope scope, Operand<T> indices, Operand<TInt32> depth, Operand<U> onValue, Operand<U> offValue, Options... options) {
+  public static <U extends TType> OneHot<U> create(Scope scope, Operand<? extends TNumber> indices, Operand<TInt32> depth, Operand<U> onValue, Operand<U> offValue, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("OneHot", scope.makeOpName("OneHot"));
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(depth.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java
index ed4e3e5e36a..f455f0fc98c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java
@@ -71,7 +71,7 @@ public final class Pad<T extends TType> extends RawOp implements Operand<T> {
    * @return a new instance of Pad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Pad<T> create(Scope scope, Operand<T> input, Operand<U> paddings, Operand<T> constantValues) {
+  public static <T extends TType> Pad<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> paddings, Operand<T> constantValues) {
     OperationBuilder opBuilder = scope.env().opBuilder("PadV2", scope.makeOpName("Pad"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java
index bdd361de117..3d48cb2a4d3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of Prod
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Prod<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> Prod<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Prod", scope.makeOpName("Prod"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java
index a0d66078672..13a8a62b000 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java
@@ -50,7 +50,7 @@ public final class QuantizedReshape<T extends TType> extends RawOp {
    * @return a new instance of QuantizedReshape
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> QuantizedReshape<T> create(Scope scope, Operand<T> tensor, Operand<U> shape, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
+  public static <T extends TType> QuantizedReshape<T> create(Scope scope, Operand<T> tensor, Operand<? extends TNumber> shape, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedReshape", scope.makeOpName("QuantizedReshape"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(shape.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java
index e948bc5d909..cff0df03467 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java
@@ -54,7 +54,7 @@ public final class Rank extends RawOp implements Operand<TInt32> {
    * @return a new instance of Rank
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Rank create(Scope scope, Operand<T> input) {
+  public static Rank create(Scope scope, Operand<? extends TType> input) {
     OperationBuilder opBuilder = scope.env().opBuilder("Rank", scope.makeOpName("Rank"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java
index 9c731309c44..fee74f3b81f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java
@@ -69,7 +69,7 @@ private Options() {
    * @return a new instance of ReduceAll
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> ReduceAll create(Scope scope, Operand<TBool> input, Operand<T> axis, Options... options) {
+  public static ReduceAll create(Scope scope, Operand<TBool> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("All", scope.makeOpName("ReduceAll"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java
index ce57bd4911b..ff0b97078f9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java
@@ -69,7 +69,7 @@ private Options() {
    * @return a new instance of ReduceAny
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> ReduceAny create(Scope scope, Operand<TBool> input, Operand<T> axis, Options... options) {
+  public static ReduceAny create(Scope scope, Operand<TBool> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Any", scope.makeOpName("ReduceAny"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java
index eadff9f51cc..44418b844d9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of ReduceMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ReduceMax<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> ReduceMax<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Max", scope.makeOpName("ReduceMax"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java
index 04dad318bd7..6a7f4361324 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of ReduceMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ReduceMin<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> ReduceMin<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Min", scope.makeOpName("ReduceMin"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java
index d58e64e5506..da78a30db62 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of ReduceProd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ReduceProd<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> ReduceProd<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Prod", scope.makeOpName("ReduceProd"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java
index 5344feb6790..c06b2998a67 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of ReduceSum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ReduceSum<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> ReduceSum<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Sum", scope.makeOpName("ReduceSum"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java
index 6bf11ac1cb6..1da37dd550d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java
@@ -105,7 +105,7 @@ public final class Reshape<T extends TType> extends RawOp implements Operand<T>
    * @return a new instance of Reshape
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Reshape<T> create(Scope scope, Operand<T> tensor, Operand<U> shape) {
+  public static <T extends TType> Reshape<T> create(Scope scope, Operand<T> tensor, Operand<? extends TNumber> shape) {
     OperationBuilder opBuilder = scope.env().opBuilder("Reshape", scope.makeOpName("Reshape"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(shape.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java
index 4830d44d3ba..c8906164dd7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java
@@ -90,7 +90,7 @@ private Options() {
    * @return a new instance of ResourceGather
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> ResourceGather<U> create(Scope scope, Operand<?> resource, Operand<T> indices, Class<U> dtype, Options... options) {
+  public static <U extends TType> ResourceGather<U> create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Class<U> dtype, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceGather", scope.makeOpName("ResourceGather"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java
index d78b649a997..5cadc84d016 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java
@@ -45,7 +45,7 @@ public final class ResourceGatherNd<U extends TType> extends RawOp implements Op
    * @return a new instance of ResourceGatherNd
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> ResourceGatherNd<U> create(Scope scope, Operand<?> resource, Operand<T> indices, Class<U> dtype) {
+  public static <U extends TType> ResourceGatherNd<U> create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Class<U> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceGatherNd", scope.makeOpName("ResourceGatherNd"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java
index 3192cacae98..935000e7ec6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java
@@ -63,7 +63,7 @@ public final class ResourceScatterAdd extends RawOp {
    * @return a new instance of ResourceScatterAdd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterAdd create(Scope scope, Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public static ResourceScatterAdd create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterAdd", scope.makeOpName("ResourceScatterAdd"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java
index bd09a85926c..8a21a2706a3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java
@@ -63,7 +63,7 @@ public final class ResourceScatterDiv extends RawOp {
    * @return a new instance of ResourceScatterDiv
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterDiv create(Scope scope, Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public static ResourceScatterDiv create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterDiv", scope.makeOpName("ResourceScatterDiv"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java
index 45f49015271..7e6ca9e3302 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java
@@ -63,7 +63,7 @@ public final class ResourceScatterMax extends RawOp {
    * @return a new instance of ResourceScatterMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterMax create(Scope scope, Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public static ResourceScatterMax create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMax", scope.makeOpName("ResourceScatterMax"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java
index a39cbb50473..9fa3cf76ca8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java
@@ -63,7 +63,7 @@ public final class ResourceScatterMin extends RawOp {
    * @return a new instance of ResourceScatterMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterMin create(Scope scope, Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public static ResourceScatterMin create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMin", scope.makeOpName("ResourceScatterMin"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java
index 824a32a4365..1133e6f2f82 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java
@@ -63,7 +63,7 @@ public final class ResourceScatterMul extends RawOp {
    * @return a new instance of ResourceScatterMul
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterMul create(Scope scope, Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public static ResourceScatterMul create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMul", scope.makeOpName("ResourceScatterMul"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java
index 7cbc9c5e95e..5a020f072df 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java
@@ -97,7 +97,7 @@ private Options() {
    * @return a new instance of ResourceScatterNdAdd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterNdAdd create(Scope scope, Operand<?> ref, Operand<T> indices, Operand<U> updates, Options... options) {
+  public static ResourceScatterNdAdd create(Scope scope, Operand<?> ref, Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdAdd", scope.makeOpName("ResourceScatterNdAdd"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java
index a2376fdd93e..156af50c380 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java
@@ -66,7 +66,7 @@ private Options() {
    * @return a new instance of ResourceScatterNdMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterNdMax create(Scope scope, Operand<?> ref, Operand<T> indices, Operand<U> updates, Options... options) {
+  public static ResourceScatterNdMax create(Scope scope, Operand<?> ref, Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdMax", scope.makeOpName("ResourceScatterNdMax"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java
index b17a4bad0a8..45909f9cbab 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java
@@ -66,7 +66,7 @@ private Options() {
    * @return a new instance of ResourceScatterNdMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterNdMin create(Scope scope, Operand<?> ref, Operand<T> indices, Operand<U> updates, Options... options) {
+  public static ResourceScatterNdMin create(Scope scope, Operand<?> ref, Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdMin", scope.makeOpName("ResourceScatterNdMin"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java
index c8f6072e0ee..4e166746f7b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java
@@ -97,7 +97,7 @@ private Options() {
    * @return a new instance of ResourceScatterNdSub
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterNdSub create(Scope scope, Operand<?> ref, Operand<T> indices, Operand<U> updates, Options... options) {
+  public static ResourceScatterNdSub create(Scope scope, Operand<?> ref, Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdSub", scope.makeOpName("ResourceScatterNdSub"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java
index 2319e1623a7..ae9539388d7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java
@@ -99,7 +99,7 @@ private Options() {
    * @return a new instance of ResourceScatterNdUpdate
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterNdUpdate create(Scope scope, Operand<?> ref, Operand<T> indices, Operand<U> updates, Options... options) {
+  public static ResourceScatterNdUpdate create(Scope scope, Operand<?> ref, Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdUpdate", scope.makeOpName("ResourceScatterNdUpdate"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java
index bed6347bf94..35d94ad5a52 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java
@@ -63,7 +63,7 @@ public final class ResourceScatterSub extends RawOp {
    * @return a new instance of ResourceScatterSub
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterSub create(Scope scope, Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public static ResourceScatterSub create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterSub", scope.makeOpName("ResourceScatterSub"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java
index 117e4657c4a..df04dff7608 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java
@@ -54,7 +54,7 @@ public final class ResourceScatterUpdate extends RawOp {
    * @return a new instance of ResourceScatterUpdate
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceScatterUpdate create(Scope scope, Operand<?> resource, Operand<T> indices, Operand<U> updates) {
+  public static ResourceScatterUpdate create(Scope scope, Operand<?> resource, Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterUpdate", scope.makeOpName("ResourceScatterUpdate"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java
index e7e406142db..d0e6fc06b2f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java
@@ -108,7 +108,7 @@ private Options() {
    * @return a new instance of ResourceStridedSliceAssign
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> ResourceStridedSliceAssign create(Scope scope, Operand<?> ref, Operand<T> begin, Operand<T> end, Operand<T> strides, Operand<U> value, Options... options) {
+  public static <T extends TNumber> ResourceStridedSliceAssign create(Scope scope, Operand<?> ref, Operand<T> begin, Operand<T> end, Operand<T> strides, Operand<? extends TType> value, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceStridedSliceAssign", scope.makeOpName("ResourceStridedSliceAssign"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(begin.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java
index 9b87881ee88..95cc701bae3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java
@@ -93,7 +93,7 @@ public final class Reverse<T extends TType> extends RawOp implements Operand<T>
    * @return a new instance of Reverse
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Reverse<T> create(Scope scope, Operand<T> tensor, Operand<U> axis) {
+  public static <T extends TType> Reverse<T> create(Scope scope, Operand<T> tensor, Operand<? extends TNumber> axis) {
     OperationBuilder opBuilder = scope.env().opBuilder("ReverseV2", scope.makeOpName("Reverse"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java
index 7db393ecd50..6793713f659 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java
@@ -120,7 +120,7 @@ private Options() {
    * @return a new instance of ReverseSequence
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ReverseSequence<T> create(Scope scope, Operand<T> input, Operand<U> seqLengths, Long seqDim, Options... options) {
+  public static <T extends TType> ReverseSequence<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> seqLengths, Long seqDim, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ReverseSequence", scope.makeOpName("ReverseSequence"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(seqLengths.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java
index f353e8f3053..4151cb41a3e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java
@@ -73,7 +73,7 @@ public final class Roll<T extends TType> extends RawOp implements Operand<T> {
    * @return a new instance of Roll
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber, V extends TNumber> Roll<T> create(Scope scope, Operand<T> input, Operand<U> shift, Operand<V> axis) {
+  public static <T extends TType> Roll<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> shift, Operand<? extends TNumber> axis) {
     OperationBuilder opBuilder = scope.env().opBuilder("Roll", scope.makeOpName("Roll"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(shift.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java
index 560aa2f9ef5..61b7f0e29c6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java
@@ -90,7 +90,7 @@ private Options() {
    * @return a new instance of ScatterAdd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterAdd<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterAdd<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterAdd", scope.makeOpName("ScatterAdd"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java
index 68053623830..d7de6fb959d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java
@@ -86,7 +86,7 @@ private Options() {
    * @return a new instance of ScatterDiv
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterDiv<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterDiv<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterDiv", scope.makeOpName("ScatterDiv"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java
index 746a6d30a35..b76c71f3aad 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java
@@ -89,7 +89,7 @@ private Options() {
    * @return a new instance of ScatterMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> ScatterMax<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TNumber> ScatterMax<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterMax", scope.makeOpName("ScatterMax"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java
index 4f854496bf3..20c4393ce79 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java
@@ -89,7 +89,7 @@ private Options() {
    * @return a new instance of ScatterMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> ScatterMin<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TNumber> ScatterMin<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterMin", scope.makeOpName("ScatterMin"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java
index fa4389e6ce9..7b155dd8fd5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java
@@ -86,7 +86,7 @@ private Options() {
    * @return a new instance of ScatterMul
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterMul<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterMul<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterMul", scope.makeOpName("ScatterMul"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java
index 5de6047092a..3ccd389abcb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java
@@ -100,7 +100,7 @@ private Options() {
    * @return a new instance of ScatterNdAdd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterNdAdd<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterNdAdd<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdAdd", scope.makeOpName("ScatterNdAdd"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java
index 8d2868513c5..8c77ecad143 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java
@@ -69,7 +69,7 @@ private Options() {
    * @return a new instance of ScatterNdMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterNdMax<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterNdMax<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdMax", scope.makeOpName("ScatterNdMax"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java
index 003fd99f1a4..19fbd9eac1e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java
@@ -69,7 +69,7 @@ private Options() {
    * @return a new instance of ScatterNdMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterNdMin<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterNdMin<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdMin", scope.makeOpName("ScatterNdMin"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java
index 1e0ee82487a..09396a80e86 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java
@@ -82,7 +82,7 @@ public final class ScatterNdNonAliasingAdd<T extends TType> extends RawOp implem
    * @return a new instance of ScatterNdNonAliasingAdd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterNdNonAliasingAdd<T> create(Scope scope, Operand<T> input, Operand<U> indices, Operand<T> updates) {
+  public static <T extends TType> ScatterNdNonAliasingAdd<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> indices, Operand<T> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdNonAliasingAdd", scope.makeOpName("ScatterNdNonAliasingAdd"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java
index 6c07f70d28a..e391a05ff82 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java
@@ -102,7 +102,7 @@ private Options() {
    * @return a new instance of ScatterNdSub
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterNdSub<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterNdSub<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdSub", scope.makeOpName("ScatterNdSub"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java
index 89e36796e22..13eb21a735c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java
@@ -104,7 +104,7 @@ private Options() {
    * @return a new instance of ScatterNdUpdate
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterNdUpdate<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterNdUpdate<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdUpdate", scope.makeOpName("ScatterNdUpdate"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java
index 2b5d2c9d488..0d53ef622fe 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java
@@ -89,7 +89,7 @@ private Options() {
    * @return a new instance of ScatterSub
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterSub<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterSub<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterSub", scope.makeOpName("ScatterSub"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java
index ae49b0f626d..37efa7194e8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java
@@ -93,7 +93,7 @@ private Options() {
    * @return a new instance of ScatterUpdate
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ScatterUpdate<T> create(Scope scope, Operand<T> ref, Operand<U> indices, Operand<T> updates, Options... options) {
+  public static <T extends TType> ScatterUpdate<T> create(Scope scope, Operand<T> ref, Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScatterUpdate", scope.makeOpName("ScatterUpdate"));
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java
index 92f4babee07..480cd265f1a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java
@@ -66,7 +66,7 @@ private Options() {
    * @return a new instance of Send
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Send create(Scope scope, Operand<T> tensor, String tensorName, String sendDevice, Long sendDeviceIncarnation, String recvDevice, Options... options) {
+  public static Send create(Scope scope, Operand<? extends TType> tensor, String tensorName, String sendDevice, Long sendDeviceIncarnation, String recvDevice, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Send", scope.makeOpName("Send"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java
index 921306f689d..bfa86868a72 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java
@@ -72,7 +72,7 @@ private Options() {
    * @return a new instance of SetSize
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> SetSize create(Scope scope, Operand<TInt64> setIndices, Operand<T> setValues, Operand<TInt64> setShape, Options... options) {
+  public static SetSize create(Scope scope, Operand<TInt64> setIndices, Operand<? extends TType> setValues, Operand<TInt64> setShape, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SetSize", scope.makeOpName("SetSize"));
     opBuilder.addInput(setIndices.asOutput());
     opBuilder.addInput(setValues.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java
index a2d8a43a496..dbb34980213 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java
@@ -56,7 +56,7 @@ public final class Shape<U extends TNumber> extends RawOp implements Operand<U>
    * @return a new instance of Shape
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Shape<U> create(Scope scope, Operand<T> input, Class<U> outType) {
+  public static <U extends TNumber> Shape<U> create(Scope scope, Operand<? extends TType> input, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("Shape", scope.makeOpName("Shape"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
@@ -72,7 +72,7 @@ public static <U extends TNumber, T extends TType> Shape<U> create(Scope scope,
    * @return a new instance of Shape
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Shape<TInt32> create(Scope scope, Operand<T> input) {
+  public static Shape<TInt32> create(Scope scope, Operand<? extends TType> input) {
     return create(scope, input, TInt32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java
index 127608e1fac..07ab596ea23 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java
@@ -57,7 +57,7 @@ public final class Size<U extends TNumber> extends RawOp implements Operand<U> {
    * @return a new instance of Size
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Size<U> create(Scope scope, Operand<T> input, Class<U> outType) {
+  public static <U extends TNumber> Size<U> create(Scope scope, Operand<? extends TType> input, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("Size", scope.makeOpName("Size"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
@@ -73,7 +73,7 @@ public static <U extends TNumber, T extends TType> Size<U> create(Scope scope, O
    * @return a new instance of Size
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Size<TInt32> create(Scope scope, Operand<T> input) {
+  public static Size<TInt32> create(Scope scope, Operand<? extends TType> input) {
     return create(scope, input, TInt32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java
index 2f01a06e6c6..df34fd91afd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java
@@ -147,7 +147,7 @@ public final class SpaceToBatchNd<T extends TType> extends RawOp implements Oper
    * @return a new instance of SpaceToBatchNd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber, V extends TNumber> SpaceToBatchNd<T> create(Scope scope, Operand<T> input, Operand<U> blockShape, Operand<V> paddings) {
+  public static <T extends TType> SpaceToBatchNd<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> blockShape, Operand<? extends TNumber> paddings) {
     OperationBuilder opBuilder = scope.env().opBuilder("SpaceToBatchND", scope.makeOpName("SpaceToBatchNd"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(blockShape.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java
index 9b0bfac7e6a..ee7dced8ee8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java
@@ -54,7 +54,7 @@ public final class SplitV<T extends TType> extends RawOp implements Iterable<Ope
    * @return a new instance of SplitV
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SplitV<T> create(Scope scope, Operand<T> value, Operand<U> sizeSplits, Operand<TInt32> axis, Long numSplit) {
+  public static <T extends TType> SplitV<T> create(Scope scope, Operand<T> value, Operand<? extends TNumber> sizeSplits, Operand<TInt32> axis, Long numSplit) {
     OperationBuilder opBuilder = scope.env().opBuilder("SplitV", scope.makeOpName("SplitV"));
     opBuilder.addInput(value.asOutput());
     opBuilder.addInput(sizeSplits.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java
index 0d8e4741bdd..0eedfb90a82 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of Sum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Sum<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> Sum<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Sum", scope.makeOpName("Sum"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java
index 3bf5d2c0912..f00c1477b05 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java
@@ -48,7 +48,7 @@ public final class TensorArrayScatter extends RawOp implements Operand<TFloat32>
    * @return a new instance of TensorArrayScatter
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorArrayScatter create(Scope scope, Operand<?> handle, Operand<TInt32> indices, Operand<T> value, Operand<TFloat32> flowIn) {
+  public static TensorArrayScatter create(Scope scope, Operand<?> handle, Operand<TInt32> indices, Operand<? extends TType> value, Operand<TFloat32> flowIn) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayScatterV3", scope.makeOpName("TensorArrayScatter"));
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java
index 220c1bd5e09..eaab6d412fd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java
@@ -69,7 +69,7 @@ public final class TensorArraySplit extends RawOp implements Operand<TFloat32> {
    * @return a new instance of TensorArraySplit
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorArraySplit create(Scope scope, Operand<?> handle, Operand<T> value, Operand<TInt64> lengths, Operand<TFloat32> flowIn) {
+  public static TensorArraySplit create(Scope scope, Operand<?> handle, Operand<? extends TType> value, Operand<TInt64> lengths, Operand<TFloat32> flowIn) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorArraySplitV3", scope.makeOpName("TensorArraySplit"));
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(value.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java
index b1beed2573d..82f62c98658 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java
@@ -44,7 +44,7 @@ public final class TensorArrayUnpack extends RawOp implements Operand<TFloat32>
    * @return a new instance of TensorArrayUnpack
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorArrayUnpack create(Scope scope, Operand<TString> handle, Operand<T> value, Operand<TFloat32> flowIn) {
+  public static TensorArrayUnpack create(Scope scope, Operand<TString> handle, Operand<? extends TType> value, Operand<TFloat32> flowIn) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayUnpack", scope.makeOpName("TensorArrayUnpack"));
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(value.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java
index 0d9224a1892..0d2fde02369 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java
@@ -46,7 +46,7 @@ public final class TensorArrayWrite extends RawOp implements Operand<TFloat32> {
    * @return a new instance of TensorArrayWrite
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorArrayWrite create(Scope scope, Operand<?> handle, Operand<TInt32> index, Operand<T> value, Operand<TFloat32> flowIn) {
+  public static TensorArrayWrite create(Scope scope, Operand<?> handle, Operand<TInt32> index, Operand<? extends TType> value, Operand<TFloat32> flowIn) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayWriteV3", scope.makeOpName("TensorArrayWrite"));
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(index.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java
index 685c9c1d900..e419a43b504 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java
@@ -62,7 +62,7 @@ public final class TensorListConcat<U extends TType> extends RawOp {
    * @return a new instance of TensorListConcat
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> TensorListConcat<U> create(Scope scope, Operand<?> inputHandle, Operand<T> elementShape, Operand<TInt64> leadingDims, Class<U> elementDtype) {
+  public static <U extends TType> TensorListConcat<U> create(Scope scope, Operand<?> inputHandle, Operand<? extends TNumber> elementShape, Operand<TInt64> leadingDims, Class<U> elementDtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListConcatV2", scope.makeOpName("TensorListConcat"));
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(elementShape.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java
index fe8bc83b4b0..128c23f0947 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java
@@ -48,7 +48,7 @@ public final class TensorListFromTensor extends RawOp implements Operand<TType>
    * @return a new instance of TensorListFromTensor
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorListFromTensor create(Scope scope, Operand<T> tensor, Operand<U> elementShape) {
+  public static TensorListFromTensor create(Scope scope, Operand<? extends TType> tensor, Operand<? extends TNumber> elementShape) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListFromTensor", scope.makeOpName("TensorListFromTensor"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(elementShape.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java
index 507c17654f3..8f831c0ba7c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java
@@ -48,7 +48,7 @@ public final class TensorListPushBack extends RawOp implements Operand<TType> {
    * @return a new instance of TensorListPushBack
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorListPushBack create(Scope scope, Operand<?> inputHandle, Operand<T> tensor) {
+  public static TensorListPushBack create(Scope scope, Operand<?> inputHandle, Operand<? extends TType> tensor) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListPushBack", scope.makeOpName("TensorListPushBack"));
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(tensor.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java
index 3ec33e9d73e..b39bb5027fd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java
@@ -41,7 +41,7 @@ public final class TensorListPushBackBatch extends RawOp implements Operand<TTyp
    * @return a new instance of TensorListPushBackBatch
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorListPushBackBatch create(Scope scope, Operand<?> inputHandles, Operand<T> tensor) {
+  public static TensorListPushBackBatch create(Scope scope, Operand<?> inputHandles, Operand<? extends TType> tensor) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListPushBackBatch", scope.makeOpName("TensorListPushBackBatch"));
     opBuilder.addInput(inputHandles.asOutput());
     opBuilder.addInput(tensor.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java
index 71e4c2b2f06..19bf60b1ce2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java
@@ -51,7 +51,7 @@ public final class TensorListReserve extends RawOp implements Operand<TType> {
    * @return a new instance of TensorListReserve
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> TensorListReserve create(Scope scope, Operand<T> elementShape, Operand<TInt32> numElements, Class<U> elementDtype) {
+  public static <U extends TType> TensorListReserve create(Scope scope, Operand<? extends TNumber> elementShape, Operand<TInt32> numElements, Class<U> elementDtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListReserve", scope.makeOpName("TensorListReserve"));
     opBuilder.addInput(elementShape.asOutput());
     opBuilder.addInput(numElements.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java
index 3c8bf8c84b3..98aaadd7a7c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java
@@ -58,7 +58,7 @@ public final class TensorListScatter extends RawOp implements Operand<TType> {
    * @return a new instance of TensorListScatter
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorListScatter create(Scope scope, Operand<T> tensor, Operand<TInt32> indices, Operand<U> elementShape, Operand<TInt32> numElements) {
+  public static TensorListScatter create(Scope scope, Operand<? extends TType> tensor, Operand<TInt32> indices, Operand<? extends TNumber> elementShape, Operand<TInt32> numElements) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListScatterV2", scope.makeOpName("TensorListScatter"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java
index 6ddd715fd0b..da49a9d672f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java
@@ -52,7 +52,7 @@ public final class TensorListScatterIntoExistingList extends RawOp implements Op
    * @return a new instance of TensorListScatterIntoExistingList
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorListScatterIntoExistingList create(Scope scope, Operand<?> inputHandle, Operand<T> tensor, Operand<TInt32> indices) {
+  public static TensorListScatterIntoExistingList create(Scope scope, Operand<?> inputHandle, Operand<? extends TType> tensor, Operand<TInt32> indices) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListScatterIntoExistingList", scope.makeOpName("TensorListScatterIntoExistingList"));
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(tensor.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java
index 777feebff93..3f8df2fd889 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java
@@ -43,7 +43,7 @@ public final class TensorListSetItem extends RawOp implements Operand<TType> {
    * @return a new instance of TensorListSetItem
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorListSetItem create(Scope scope, Operand<?> inputHandle, Operand<TInt32> index, Operand<T> item) {
+  public static TensorListSetItem create(Scope scope, Operand<?> inputHandle, Operand<TInt32> index, Operand<? extends TType> item) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListSetItem", scope.makeOpName("TensorListSetItem"));
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(index.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java
index 5fffd258452..2dc7bf979b5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java
@@ -53,7 +53,7 @@ public final class TensorListSplit extends RawOp implements Operand<TType> {
    * @return a new instance of TensorListSplit
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorListSplit create(Scope scope, Operand<T> tensor, Operand<U> elementShape, Operand<TInt64> lengths) {
+  public static TensorListSplit create(Scope scope, Operand<? extends TType> tensor, Operand<? extends TNumber> elementShape, Operand<TInt64> lengths) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorListSplit", scope.makeOpName("TensorListSplit"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(elementShape.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterMax.java
deleted file mode 100644
index 48c1d75a63f..00000000000
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterMax.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-=======================================================================*/
-
-// This class has been generated, DO NOT EDIT!
-
-package org.tensorflow.op.core;
-
-import org.tensorflow.Operand;
-import org.tensorflow.Operation;
-import org.tensorflow.OperationBuilder;
-import org.tensorflow.Output;
-import org.tensorflow.op.RawOp;
-import org.tensorflow.op.Scope;
-import org.tensorflow.op.annotation.Endpoint;
-import org.tensorflow.op.annotation.Operator;
-import org.tensorflow.types.family.TNumber;
-import org.tensorflow.types.family.TType;
-
-/**
- * @param <T> data type for {@code output()} output
- */
-@Operator
-public final class TensorScatterMax<T extends TType> extends RawOp implements Operand<T> {
-  
-  /**
-   * Factory method to create a class wrapping a new TensorScatterMax operation.
-   * 
-   * @param scope current scope
-   * @param tensor Tensor to update.
-   * @param indices Index tensor.
-   * @param updates Updates to scatter into output.
-   * @return a new instance of TensorScatterMax
-   */
-  @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorScatterMax<T> create(Scope scope, Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterMax", scope.makeOpName("TensorScatterMax"));
-    opBuilder.addInput(tensor.asOutput());
-    opBuilder.addInput(indices.asOutput());
-    opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
-    return new TensorScatterMax<T>(opBuilder.build());
-  }
-  
-  /**
-   * A new tensor copied from tensor whose values are element-wise maximum between tensor and updates according to the indices.
-   */
-  public Output<T> output() {
-    return output;
-  }
-  
-  @Override
-  public Output<T> asOutput() {
-    return output;
-  }
-  
-  private Output<T> output;
-  
-  private TensorScatterMax(Operation operation) {
-    super(operation);
-    int outputIdx = 0;
-    output = operation.output(outputIdx++);
-  }
-}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterMin.java
deleted file mode 100644
index ddbe03e7c6e..00000000000
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterMin.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-=======================================================================*/
-
-// This class has been generated, DO NOT EDIT!
-
-package org.tensorflow.op.core;
-
-import org.tensorflow.Operand;
-import org.tensorflow.Operation;
-import org.tensorflow.OperationBuilder;
-import org.tensorflow.Output;
-import org.tensorflow.op.RawOp;
-import org.tensorflow.op.Scope;
-import org.tensorflow.op.annotation.Endpoint;
-import org.tensorflow.op.annotation.Operator;
-import org.tensorflow.types.family.TNumber;
-import org.tensorflow.types.family.TType;
-
-/**
- * @param <T> data type for {@code output()} output
- */
-@Operator
-public final class TensorScatterMin<T extends TType> extends RawOp implements Operand<T> {
-  
-  /**
-   * Factory method to create a class wrapping a new TensorScatterMin operation.
-   * 
-   * @param scope current scope
-   * @param tensor Tensor to update.
-   * @param indices Index tensor.
-   * @param updates Updates to scatter into output.
-   * @return a new instance of TensorScatterMin
-   */
-  @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorScatterMin<T> create(Scope scope, Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterMin", scope.makeOpName("TensorScatterMin"));
-    opBuilder.addInput(tensor.asOutput());
-    opBuilder.addInput(indices.asOutput());
-    opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
-    return new TensorScatterMin<T>(opBuilder.build());
-  }
-  
-  /**
-   * A new tensor copied from tensor whose values are element-wise minimum between tensor and updates according to the indices.
-   */
-  public Output<T> output() {
-    return output;
-  }
-  
-  @Override
-  public Output<T> asOutput() {
-    return output;
-  }
-  
-  private Output<T> output;
-  
-  private TensorScatterMin(Operation operation) {
-    super(operation);
-    int outputIdx = 0;
-    output = operation.output(outputIdx++);
-  }
-}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java
index 9a3a1a174a8..52954e4e323 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java
@@ -106,7 +106,7 @@ public final class TensorScatterNdAdd<T extends TType> extends RawOp implements
    * @return a new instance of TensorScatterNdAdd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorScatterNdAdd<T> create(Scope scope, Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public static <T extends TType> TensorScatterNdAdd<T> create(Scope scope, Operand<T> tensor, Operand<? extends TNumber> indices, Operand<T> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterAdd", scope.makeOpName("TensorScatterNdAdd"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java
index b8d9834f08f..bd6d0be53e1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java
@@ -44,7 +44,7 @@ public final class TensorScatterNdMax<T extends TType> extends RawOp implements
    * @return a new instance of TensorScatterNdMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorScatterNdMax<T> create(Scope scope, Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public static <T extends TType> TensorScatterNdMax<T> create(Scope scope, Operand<T> tensor, Operand<? extends TNumber> indices, Operand<T> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterMax", scope.makeOpName("TensorScatterNdMax"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java
index e4e652e099f..b823931fef8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java
@@ -44,7 +44,7 @@ public final class TensorScatterNdMin<T extends TType> extends RawOp implements
    * @return a new instance of TensorScatterNdMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorScatterNdMin<T> create(Scope scope, Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public static <T extends TType> TensorScatterNdMin<T> create(Scope scope, Operand<T> tensor, Operand<? extends TNumber> indices, Operand<T> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterMin", scope.makeOpName("TensorScatterNdMin"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java
index 631e3d1ba08..a29743da711 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java
@@ -105,7 +105,7 @@ public final class TensorScatterNdSub<T extends TType> extends RawOp implements
    * @return a new instance of TensorScatterNdSub
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorScatterNdSub<T> create(Scope scope, Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public static <T extends TType> TensorScatterNdSub<T> create(Scope scope, Operand<T> tensor, Operand<? extends TNumber> indices, Operand<T> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterSub", scope.makeOpName("TensorScatterNdSub"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java
index e7f610d4b38..ff7c1ee16d7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java
@@ -120,7 +120,7 @@ public final class TensorScatterNdUpdate<T extends TType> extends RawOp implemen
    * @return a new instance of TensorScatterNdUpdate
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> TensorScatterNdUpdate<T> create(Scope scope, Operand<T> tensor, Operand<U> indices, Operand<T> updates) {
+  public static <T extends TType> TensorScatterNdUpdate<T> create(Scope scope, Operand<T> tensor, Operand<? extends TNumber> indices, Operand<T> updates) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterUpdate", scope.makeOpName("TensorScatterNdUpdate"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java
index a64f0847416..c7ee253114c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java
@@ -72,7 +72,7 @@ public final class Tile<T extends TType> extends RawOp implements Operand<T> {
    * @return a new instance of Tile
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Tile<T> create(Scope scope, Operand<T> input, Operand<U> multiples) {
+  public static <T extends TType> Tile<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> multiples) {
     OperationBuilder opBuilder = scope.env().opBuilder("Tile", scope.makeOpName("Tile"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(multiples.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java
index 40b303e2a05..acbbbbc14cb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java
@@ -90,7 +90,7 @@ public final class Unique<T extends TType, V extends TNumber> extends RawOp {
    * @return a new instance of Unique
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, V extends TNumber, U extends TNumber> Unique<T, V> create(Scope scope, Operand<T> x, Operand<U> axis, Class<V> outIdx) {
+  public static <T extends TType, V extends TNumber> Unique<T, V> create(Scope scope, Operand<T> x, Operand<? extends TNumber> axis, Class<V> outIdx) {
     OperationBuilder opBuilder = scope.env().opBuilder("UniqueV2", scope.makeOpName("Unique"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
@@ -109,7 +109,7 @@ public static <T extends TType, V extends TNumber, U extends TNumber> Unique<T,
    * @return a new instance of Unique
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Unique<T, TInt32> create(Scope scope, Operand<T> x, Operand<U> axis) {
+  public static <T extends TType> Unique<T, TInt32> create(Scope scope, Operand<T> x, Operand<? extends TNumber> axis) {
     return create(scope, x, axis, TInt32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java
index cf2ae7566cc..b2a9a5c2193 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java
@@ -94,7 +94,7 @@ public final class UniqueWithCounts<T extends TType, V extends TNumber> extends
    * @return a new instance of UniqueWithCounts
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, V extends TNumber, U extends TNumber> UniqueWithCounts<T, V> create(Scope scope, Operand<T> x, Operand<U> axis, Class<V> outIdx) {
+  public static <T extends TType, V extends TNumber> UniqueWithCounts<T, V> create(Scope scope, Operand<T> x, Operand<? extends TNumber> axis, Class<V> outIdx) {
     OperationBuilder opBuilder = scope.env().opBuilder("UniqueWithCountsV2", scope.makeOpName("UniqueWithCounts"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
@@ -113,7 +113,7 @@ public static <T extends TType, V extends TNumber, U extends TNumber> UniqueWith
    * @return a new instance of UniqueWithCounts
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> UniqueWithCounts<T, TInt32> create(Scope scope, Operand<T> x, Operand<U> axis) {
+  public static <T extends TType> UniqueWithCounts<T, TInt32> create(Scope scope, Operand<T> x, Operand<? extends TNumber> axis) {
     return create(scope, x, axis, TInt32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java
index 5bf2ad25f9e..558da8d85ac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java
@@ -102,7 +102,7 @@ public final class Where extends RawOp implements Operand<TInt64> {
    * @return a new instance of Where
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Where create(Scope scope, Operand<T> condition) {
+  public static Where create(Scope scope, Operand<? extends TType> condition) {
     OperationBuilder opBuilder = scope.env().opBuilder("Where", scope.makeOpName("Where"));
     opBuilder.addInput(condition.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java
index b9f5c3a6c72..540355e650b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java
@@ -43,7 +43,7 @@ public final class SparseTensorSliceDataset extends RawOp implements Operand<TTy
    * @return a new instance of SparseTensorSliceDataset
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> SparseTensorSliceDataset create(Scope scope, Operand<TInt64> indices, Operand<T> values, Operand<TInt64> denseShape) {
+  public static SparseTensorSliceDataset create(Scope scope, Operand<TInt64> indices, Operand<? extends TType> values, Operand<TInt64> denseShape) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorSliceDataset", scope.makeOpName("SparseTensorSliceDataset"));
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java
index 72c0222dbe4..0c3648fcc53 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java
@@ -97,7 +97,7 @@ private Options() {
    * @return a new instance of DebugNanCount
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> DebugNanCount create(Scope scope, Operand<T> input, Options... options) {
+  public static DebugNanCount create(Scope scope, Operand<? extends TType> input, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("DebugNanCount", scope.makeOpName("DebugNanCount"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java
index 281d59d21c8..7482e821f72 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java
@@ -132,7 +132,7 @@ private Options() {
    * @return a new instance of DebugNumericsSummary
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> DebugNumericsSummary<U> create(Scope scope, Operand<T> input, Class<U> outputDtype, Options... options) {
+  public static <U extends TNumber> DebugNumericsSummary<U> create(Scope scope, Operand<? extends TType> input, Class<U> outputDtype, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("DebugNumericSummaryV2", scope.makeOpName("DebugNumericsSummary"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
@@ -159,7 +159,7 @@ public static <U extends TNumber, T extends TType> DebugNumericsSummary<U> creat
    * @return a new instance of DebugNumericsSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> DebugNumericsSummary<TFloat32> create(Scope scope, Operand<T> input, Options... options) {
+  public static DebugNumericsSummary<TFloat32> create(Scope scope, Operand<? extends TType> input, Options... options) {
     return create(scope, input, TFloat32.class, options);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/AsString.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/AsString.java
index d81e8b6a386..90405452574 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/AsString.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/AsString.java
@@ -116,7 +116,7 @@ private Options() {
    * @return a new instance of AsString
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> AsString create(Scope scope, Operand<T> input, Options... options) {
+  public static AsString create(Scope scope, Operand<? extends TType> input, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("AsString", scope.makeOpName("AsString"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java
index 502d0e564e3..06fe5919afd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java
@@ -65,7 +65,7 @@ private Options() {
    * @return a new instance of Cast
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> Cast<U> create(Scope scope, Operand<T> x, Class<U> DstT, Options... options) {
+  public static <U extends TType> Cast<U> create(Scope scope, Operand<? extends TType> x, Class<U> DstT, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Cast", scope.makeOpName("Cast"));
     opBuilder.addInput(x.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java
index c531daca7f5..32b0e91eca4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java
@@ -54,7 +54,7 @@ public final class ToBool extends RawOp implements Operand<TBool> {
    * @return a new instance of ToBool
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> ToBool create(Scope scope, Operand<T> input) {
+  public static ToBool create(Scope scope, Operand<? extends TType> input) {
     OperationBuilder opBuilder = scope.env().opBuilder("ToBool", scope.makeOpName("ToBool"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java
index 7724191d9ef..3607c38dddf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java
@@ -107,7 +107,7 @@ private Options() {
    * @return a new instance of CropAndResize
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> CropAndResize create(Scope scope, Operand<T> image, Operand<TFloat32> boxes, Operand<TInt32> boxInd, Operand<TInt32> cropSize, Options... options) {
+  public static CropAndResize create(Scope scope, Operand<? extends TNumber> image, Operand<TFloat32> boxes, Operand<TInt32> boxInd, Operand<TInt32> cropSize, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("CropAndResize", scope.makeOpName("CropAndResize"));
     opBuilder.addInput(image.asOutput());
     opBuilder.addInput(boxes.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java
index 82dae7df1e0..a6b53c85a85 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java
@@ -78,7 +78,7 @@ private Options() {
    * @return a new instance of CropAndResizeGradBoxes
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> CropAndResizeGradBoxes create(Scope scope, Operand<TFloat32> grads, Operand<T> image, Operand<TFloat32> boxes, Operand<TInt32> boxInd, Options... options) {
+  public static CropAndResizeGradBoxes create(Scope scope, Operand<TFloat32> grads, Operand<? extends TNumber> image, Operand<TFloat32> boxes, Operand<TInt32> boxInd, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("CropAndResizeGradBoxes", scope.makeOpName("CropAndResizeGradBoxes"));
     opBuilder.addInput(grads.asOutput());
     opBuilder.addInput(image.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java
index cd0e8b89f7b..7d998947efe 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java
@@ -82,7 +82,7 @@ private Options() {
    * @return a new instance of EncodePng
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> EncodePng create(Scope scope, Operand<T> image, Options... options) {
+  public static EncodePng create(Scope scope, Operand<? extends TNumber> image, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("EncodePng", scope.makeOpName("EncodePng"));
     opBuilder.addInput(image.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java
index 4d998f6cf1b..d030c1192b7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java
@@ -78,7 +78,7 @@ private Options() {
    * @return a new instance of ResizeArea
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> ResizeArea create(Scope scope, Operand<T> images, Operand<TInt32> size, Options... options) {
+  public static ResizeArea create(Scope scope, Operand<? extends TNumber> images, Operand<TInt32> size, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResizeArea", scope.makeOpName("ResizeArea"));
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(size.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java
index ecc156ed9d8..dc6b33e3dc1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java
@@ -77,7 +77,7 @@ private Options() {
    * @return a new instance of ResizeBicubic
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> ResizeBicubic create(Scope scope, Operand<T> images, Operand<TInt32> size, Options... options) {
+  public static ResizeBicubic create(Scope scope, Operand<? extends TNumber> images, Operand<TInt32> size, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResizeBicubic", scope.makeOpName("ResizeBicubic"));
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(size.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java
index 0c96019b54d..aaf561156e2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java
@@ -77,7 +77,7 @@ private Options() {
    * @return a new instance of ResizeBilinear
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> ResizeBilinear create(Scope scope, Operand<T> images, Operand<TInt32> size, Options... options) {
+  public static ResizeBilinear create(Scope scope, Operand<? extends TNumber> images, Operand<TInt32> size, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResizeBilinear", scope.makeOpName("ResizeBilinear"));
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(size.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java
index 41d49fd75f2..7c728f587c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java
@@ -74,7 +74,7 @@ private Options() {
    * @return a new instance of ScaleAndTranslate
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> ScaleAndTranslate create(Scope scope, Operand<T> images, Operand<TInt32> size, Operand<TFloat32> scale, Operand<TFloat32> translation, Options... options) {
+  public static ScaleAndTranslate create(Scope scope, Operand<? extends TNumber> images, Operand<TInt32> size, Operand<TFloat32> scale, Operand<TFloat32> translation, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScaleAndTranslate", scope.makeOpName("ScaleAndTranslate"));
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(size.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java
index 8a712e7278b..1d839e16c3e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java
@@ -58,7 +58,7 @@ public final class SerializeManySparse<U extends TType> extends RawOp implements
    * @return a new instance of SerializeManySparse
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> SerializeManySparse<U> create(Scope scope, Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape, Class<U> outType) {
+  public static <U extends TType> SerializeManySparse<U> create(Scope scope, Operand<TInt64> sparseIndices, Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("SerializeManySparse", scope.makeOpName("SerializeManySparse"));
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
@@ -78,7 +78,7 @@ public static <U extends TType, T extends TType> SerializeManySparse<U> create(S
    * @return a new instance of SerializeManySparse
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> SerializeManySparse<TString> create(Scope scope, Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape) {
+  public static SerializeManySparse<TString> create(Scope scope, Operand<TInt64> sparseIndices, Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape) {
     return create(scope, sparseIndices, sparseValues, sparseShape, TString.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java
index 611feb50188..fea3e5c424e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java
@@ -50,7 +50,7 @@ public final class SerializeSparse<U extends TType> extends RawOp implements Ope
    * @return a new instance of SerializeSparse
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> SerializeSparse<U> create(Scope scope, Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape, Class<U> outType) {
+  public static <U extends TType> SerializeSparse<U> create(Scope scope, Operand<TInt64> sparseIndices, Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("SerializeSparse", scope.makeOpName("SerializeSparse"));
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
@@ -70,7 +70,7 @@ public static <U extends TType, T extends TType> SerializeSparse<U> create(Scope
    * @return a new instance of SerializeSparse
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> SerializeSparse<TString> create(Scope scope, Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape) {
+  public static SerializeSparse<TString> create(Scope scope, Operand<TInt64> sparseIndices, Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape) {
     return create(scope, sparseIndices, sparseValues, sparseShape, TString.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java
index 03f42534ba5..809b16786e4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java
@@ -42,7 +42,7 @@ public final class SerializeTensor extends RawOp implements Operand<TString> {
    * @return a new instance of SerializeTensor
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> SerializeTensor create(Scope scope, Operand<T> tensor) {
+  public static SerializeTensor create(Scope scope, Operand<? extends TType> tensor) {
     OperationBuilder opBuilder = scope.env().opBuilder("SerializeTensor", scope.makeOpName("SerializeTensor"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java
index e4e9bc38f9c..12bfdcc5e8a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java
@@ -49,7 +49,7 @@ public final class ConjugateTranspose<T extends TType> extends RawOp implements
    * @return a new instance of ConjugateTranspose
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ConjugateTranspose<T> create(Scope scope, Operand<T> x, Operand<U> perm) {
+  public static <T extends TType> ConjugateTranspose<T> create(Scope scope, Operand<T> x, Operand<? extends TNumber> perm) {
     OperationBuilder opBuilder = scope.env().opBuilder("ConjugateTranspose", scope.makeOpName("ConjugateTranspose"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(perm.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java
index ac976cc929e..c295f5bb081 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java
@@ -78,7 +78,7 @@ private Options() {
    * @return a new instance of Eig
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> Eig<U> create(Scope scope, Operand<T> input, Class<U> Tout, Options... options) {
+  public static <U extends TType> Eig<U> create(Scope scope, Operand<? extends TType> input, Class<U> Tout, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Eig", scope.makeOpName("Eig"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java
index 220a1847c7d..2a30dd97d5d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of EuclideanNorm
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> EuclideanNorm<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> EuclideanNorm<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("EuclideanNorm", scope.makeOpName("EuclideanNorm"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java
index 517578fe83e..28e9c3ae7c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java
@@ -87,7 +87,7 @@ private Options() {
    * @return a new instance of QuantizedMatMul
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType, W extends TType> QuantizedMatMul<V> create(Scope scope, Operand<T> a, Operand<U> b, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<V> Toutput, Class<W> Tactivation, Options... options) {
+  public static <V extends TType, W extends TType> QuantizedMatMul<V> create(Scope scope, Operand<? extends TType> a, Operand<? extends TType> b, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<V> Toutput, Class<W> Tactivation, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMul", scope.makeOpName("QuantizedMatMul"));
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java
index 26ebb08a09e..fd85581fbc9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java
@@ -97,7 +97,7 @@ private Options() {
    * @return a new instance of QuantizedMatMulWithBias
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TType, T extends TType, U extends TType, V extends TType> QuantizedMatMulWithBias<W> create(Scope scope, Operand<T> a, Operand<U> b, Operand<V> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<W> Toutput, Options... options) {
+  public static <W extends TType> QuantizedMatMulWithBias<W> create(Scope scope, Operand<? extends TType> a, Operand<? extends TType> b, Operand<? extends TType> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<W> Toutput, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBias", scope.makeOpName("QuantizedMatMulWithBias"));
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java
index 12208c96a14..ddf4f44b6d2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java
@@ -98,7 +98,7 @@ private Options() {
    * @return a new instance of QuantizedMatMulWithBiasAndRelu
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedMatMulWithBiasAndRelu<V> create(Scope scope, Operand<T> a, Operand<U> b, Operand<TFloat32> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<V> Toutput, Options... options) {
+  public static <V extends TType> QuantizedMatMulWithBiasAndRelu<V> create(Scope scope, Operand<? extends TType> a, Operand<? extends TType> b, Operand<TFloat32> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<V> Toutput, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndRelu", scope.makeOpName("QuantizedMatMulWithBiasAndRelu"));
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java
index a20287446c7..06734e0a715 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java
@@ -101,7 +101,7 @@ private Options() {
    * @return a new instance of QuantizedMatMulWithBiasAndReluAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TType, T extends TType, U extends TType, V extends TType> QuantizedMatMulWithBiasAndReluAndRequantize<W> create(Scope scope, Operand<T> a, Operand<U> b, Operand<V> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
+  public static <W extends TType> QuantizedMatMulWithBiasAndReluAndRequantize<W> create(Scope scope, Operand<? extends TType> a, Operand<? extends TType> b, Operand<? extends TType> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedMatMulWithBiasAndReluAndRequantize"));
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java
index de08e116e7b..41d9c28d9d2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java
@@ -48,7 +48,7 @@ public final class Transpose<T extends TType> extends RawOp implements Operand<T
    * @return a new instance of Transpose
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Transpose<T> create(Scope scope, Operand<T> x, Operand<U> perm) {
+  public static <T extends TType> Transpose<T> create(Scope scope, Operand<T> x, Operand<? extends TNumber> perm) {
     OperationBuilder opBuilder = scope.env().opBuilder("Transpose", scope.makeOpName("Transpose"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(perm.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java
index c650dfdacb2..f380826f82d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java
@@ -42,7 +42,7 @@ public final class DenseToCSRSparseMatrix extends RawOp implements Operand<TType
    * @return a new instance of DenseToCSRSparseMatrix
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> DenseToCSRSparseMatrix create(Scope scope, Operand<T> denseInput, Operand<TInt64> indices) {
+  public static DenseToCSRSparseMatrix create(Scope scope, Operand<? extends TType> denseInput, Operand<TInt64> indices) {
     OperationBuilder opBuilder = scope.env().opBuilder("DenseToCSRSparseMatrix", scope.makeOpName("DenseToCSRSparseMatrix"));
     opBuilder.addInput(denseInput.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java
index 27068d40e1c..0939b31939c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java
@@ -50,7 +50,7 @@ public final class SparseMatrixMul extends RawOp implements Operand<TType> {
    * @return a new instance of SparseMatrixMul
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> SparseMatrixMul create(Scope scope, Operand<?> a, Operand<T> b) {
+  public static SparseMatrixMul create(Scope scope, Operand<?> a, Operand<? extends TType> b) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixMul", scope.makeOpName("SparseMatrixMul"));
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java
index c503bdf897f..985d39b6ce5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java
@@ -43,7 +43,7 @@ public final class SparseTensorToCSRSparseMatrix extends RawOp implements Operan
    * @return a new instance of SparseTensorToCSRSparseMatrix
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> SparseTensorToCSRSparseMatrix create(Scope scope, Operand<TInt64> indices, Operand<T> values, Operand<TInt64> denseShape) {
+  public static SparseTensorToCSRSparseMatrix create(Scope scope, Operand<TInt64> indices, Operand<? extends TType> values, Operand<TInt64> denseShape) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorToCSRSparseMatrix", scope.makeOpName("SparseTensorToCSRSparseMatrix"));
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java
index 9187006ac28..c92611dbc52 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java
@@ -63,7 +63,7 @@ public final class Angle<U extends TNumber> extends RawOp implements Operand<U>
    * @return a new instance of Angle
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Angle<U> create(Scope scope, Operand<T> input, Class<U> Tout) {
+  public static <U extends TNumber> Angle<U> create(Scope scope, Operand<? extends TType> input, Class<U> Tout) {
     OperationBuilder opBuilder = scope.env().opBuilder("Angle", scope.makeOpName("Angle"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
@@ -79,7 +79,7 @@ public static <U extends TNumber, T extends TType> Angle<U> create(Scope scope,
    * @return a new instance of Angle
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Angle<TFloat32> create(Scope scope, Operand<T> input) {
+  public static Angle<TFloat32> create(Scope scope, Operand<? extends TType> input) {
     return create(scope, input, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java
index 2672a53fc83..051a1645c72 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java
@@ -63,7 +63,7 @@ public final class ArgMax<V extends TNumber> extends RawOp implements Operand<V>
    * @return a new instance of ArgMax
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TType, U extends TNumber> ArgMax<V> create(Scope scope, Operand<T> input, Operand<U> dimension, Class<V> outputType) {
+  public static <V extends TNumber> ArgMax<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TNumber> dimension, Class<V> outputType) {
     OperationBuilder opBuilder = scope.env().opBuilder("ArgMax", scope.makeOpName("ArgMax"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(dimension.asOutput());
@@ -83,7 +83,7 @@ public static <V extends TNumber, T extends TType, U extends TNumber> ArgMax<V>
    * @return a new instance of ArgMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ArgMax<TInt64> create(Scope scope, Operand<T> input, Operand<U> dimension) {
+  public static ArgMax<TInt64> create(Scope scope, Operand<? extends TType> input, Operand<? extends TNumber> dimension) {
     return create(scope, input, dimension, TInt64.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java
index be484929189..8ff43dd5900 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java
@@ -63,7 +63,7 @@ public final class ArgMin<V extends TNumber> extends RawOp implements Operand<V>
    * @return a new instance of ArgMin
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TType, U extends TNumber> ArgMin<V> create(Scope scope, Operand<T> input, Operand<U> dimension, Class<V> outputType) {
+  public static <V extends TNumber> ArgMin<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TNumber> dimension, Class<V> outputType) {
     OperationBuilder opBuilder = scope.env().opBuilder("ArgMin", scope.makeOpName("ArgMin"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(dimension.asOutput());
@@ -83,7 +83,7 @@ public static <V extends TNumber, T extends TType, U extends TNumber> ArgMin<V>
    * @return a new instance of ArgMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ArgMin<TInt64> create(Scope scope, Operand<T> input, Operand<U> dimension) {
+  public static ArgMin<TInt64> create(Scope scope, Operand<? extends TType> input, Operand<? extends TNumber> dimension) {
     return create(scope, input, dimension, TInt64.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ComplexAbs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ComplexAbs.java
index ce3c3607215..67a698e0365 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ComplexAbs.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ComplexAbs.java
@@ -52,7 +52,7 @@ public final class ComplexAbs<U extends TNumber> extends RawOp implements Operan
    * @return a new instance of ComplexAbs
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> ComplexAbs<U> create(Scope scope, Operand<T> x, Class<U> Tout) {
+  public static <U extends TNumber> ComplexAbs<U> create(Scope scope, Operand<? extends TType> x, Class<U> Tout) {
     OperationBuilder opBuilder = scope.env().opBuilder("ComplexAbs", scope.makeOpName("ComplexAbs"));
     opBuilder.addInput(x.asOutput());
     opBuilder = scope.apply(opBuilder);
@@ -68,7 +68,7 @@ public static <U extends TNumber, T extends TType> ComplexAbs<U> create(Scope sc
    * @return a new instance of ComplexAbs
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> ComplexAbs<TFloat32> create(Scope scope, Operand<T> x) {
+  public static ComplexAbs<TFloat32> create(Scope scope, Operand<? extends TType> x) {
     return create(scope, x, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java
index 85897f46a8d..96c8285ea92 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java
@@ -100,7 +100,7 @@ private Options() {
    * @return a new instance of Cumprod
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Cumprod<T> create(Scope scope, Operand<T> x, Operand<U> axis, Options... options) {
+  public static <T extends TType> Cumprod<T> create(Scope scope, Operand<T> x, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Cumprod", scope.makeOpName("Cumprod"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java
index 540ed69bfee..72395338fda 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java
@@ -100,7 +100,7 @@ private Options() {
    * @return a new instance of Cumsum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Cumsum<T> create(Scope scope, Operand<T> x, Operand<U> axis, Options... options) {
+  public static <T extends TType> Cumsum<T> create(Scope scope, Operand<T> x, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Cumsum", scope.makeOpName("Cumsum"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java
index 4e53bb981c0..b8d65b857da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java
@@ -91,7 +91,7 @@ private Options() {
    * @return a new instance of CumulativeLogsumexp
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> CumulativeLogsumexp<T> create(Scope scope, Operand<T> x, Operand<U> axis, Options... options) {
+  public static <T extends TNumber> CumulativeLogsumexp<T> create(Scope scope, Operand<T> x, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("CumulativeLogsumexp", scope.makeOpName("CumulativeLogsumexp"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Imag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Imag.java
index a983a950dff..74058c43ad1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Imag.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Imag.java
@@ -59,7 +59,7 @@ public final class Imag<U extends TNumber> extends RawOp implements Operand<U> {
    * @return a new instance of Imag
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Imag<U> create(Scope scope, Operand<T> input, Class<U> Tout) {
+  public static <U extends TNumber> Imag<U> create(Scope scope, Operand<? extends TType> input, Class<U> Tout) {
     OperationBuilder opBuilder = scope.env().opBuilder("Imag", scope.makeOpName("Imag"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
@@ -75,7 +75,7 @@ public static <U extends TNumber, T extends TType> Imag<U> create(Scope scope, O
    * @return a new instance of Imag
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Imag<TFloat32> create(Scope scope, Operand<T> input) {
+  public static Imag<TFloat32> create(Scope scope, Operand<? extends TType> input) {
     return create(scope, input, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java
index 516f2330b39..6f047b27412 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java
@@ -53,7 +53,7 @@ public final class IsFinite extends RawOp implements Operand<TBool> {
    * @return a new instance of IsFinite
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> IsFinite create(Scope scope, Operand<T> x) {
+  public static IsFinite create(Scope scope, Operand<? extends TNumber> x) {
     OperationBuilder opBuilder = scope.env().opBuilder("IsFinite", scope.makeOpName("IsFinite"));
     opBuilder.addInput(x.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java
index ac1cf7946cc..a66ef147923 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java
@@ -53,7 +53,7 @@ public final class IsInf extends RawOp implements Operand<TBool> {
    * @return a new instance of IsInf
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> IsInf create(Scope scope, Operand<T> x) {
+  public static IsInf create(Scope scope, Operand<? extends TNumber> x) {
     OperationBuilder opBuilder = scope.env().opBuilder("IsInf", scope.makeOpName("IsInf"));
     opBuilder.addInput(x.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java
index f58f6a4aa38..e7542bad57e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java
@@ -53,7 +53,7 @@ public final class IsNan extends RawOp implements Operand<TBool> {
    * @return a new instance of IsNan
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> IsNan create(Scope scope, Operand<T> x) {
+  public static IsNan create(Scope scope, Operand<? extends TNumber> x) {
     OperationBuilder opBuilder = scope.env().opBuilder("IsNan", scope.makeOpName("IsNan"));
     opBuilder.addInput(x.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java
index dd192d28446..6cff5088249 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of Mean
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> Mean<T> create(Scope scope, Operand<T> input, Operand<U> axis, Options... options) {
+  public static <T extends TType> Mean<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> axis, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Mean", scope.makeOpName("Mean"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java
index c3dfd8c23c9..4907717b342 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java
@@ -49,7 +49,7 @@ public final class PopulationCount extends RawOp implements Operand<TUint8> {
    * @return a new instance of PopulationCount
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> PopulationCount create(Scope scope, Operand<T> x) {
+  public static PopulationCount create(Scope scope, Operand<? extends TNumber> x) {
     OperationBuilder opBuilder = scope.env().opBuilder("PopulationCount", scope.makeOpName("PopulationCount"));
     opBuilder.addInput(x.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java
index ad4a7435e16..5ae6dd24dd4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java
@@ -51,7 +51,7 @@ public final class QuantizedAdd<V extends TType> extends RawOp {
    * @return a new instance of QuantizedAdd
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedAdd<V> create(Scope scope, Operand<T> x, Operand<U> y, Operand<TFloat32> minX, Operand<TFloat32> maxX, Operand<TFloat32> minY, Operand<TFloat32> maxY, Class<V> Toutput) {
+  public static <V extends TType> QuantizedAdd<V> create(Scope scope, Operand<? extends TType> x, Operand<? extends TType> y, Operand<TFloat32> minX, Operand<TFloat32> maxX, Operand<TFloat32> minY, Operand<TFloat32> maxY, Class<V> Toutput) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedAdd", scope.makeOpName("QuantizedAdd"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java
index cc0a23b4a3c..bc64e12438b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java
@@ -51,7 +51,7 @@ public final class QuantizedMul<V extends TType> extends RawOp {
    * @return a new instance of QuantizedMul
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedMul<V> create(Scope scope, Operand<T> x, Operand<U> y, Operand<TFloat32> minX, Operand<TFloat32> maxX, Operand<TFloat32> minY, Operand<TFloat32> maxY, Class<V> Toutput) {
+  public static <V extends TType> QuantizedMul<V> create(Scope scope, Operand<? extends TType> x, Operand<? extends TType> y, Operand<TFloat32> minX, Operand<TFloat32> maxX, Operand<TFloat32> minY, Operand<TFloat32> maxY, Class<V> Toutput) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMul", scope.makeOpName("QuantizedMul"));
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java
index eba116d98f2..8758983ba50 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java
@@ -59,7 +59,7 @@ public final class Real<U extends TNumber> extends RawOp implements Operand<U> {
    * @return a new instance of Real
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Real<U> create(Scope scope, Operand<T> input, Class<U> Tout) {
+  public static <U extends TNumber> Real<U> create(Scope scope, Operand<? extends TType> input, Class<U> Tout) {
     OperationBuilder opBuilder = scope.env().opBuilder("Real", scope.makeOpName("Real"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
@@ -75,7 +75,7 @@ public static <U extends TNumber, T extends TType> Real<U> create(Scope scope, O
    * @return a new instance of Real
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Real<TFloat32> create(Scope scope, Operand<T> input) {
+  public static Real<TFloat32> create(Scope scope, Operand<? extends TType> input) {
     return create(scope, input, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java
index 3e771f0cdef..9439a3be134 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java
@@ -45,7 +45,7 @@ public final class RequantizationRangePerChannel extends RawOp {
    * @return a new instance of RequantizationRangePerChannel
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> RequantizationRangePerChannel create(Scope scope, Operand<T> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Float clipValueMax) {
+  public static RequantizationRangePerChannel create(Scope scope, Operand<? extends TType> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Float clipValueMax) {
     OperationBuilder opBuilder = scope.env().opBuilder("RequantizationRangePerChannel", scope.makeOpName("RequantizationRangePerChannel"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java
index d1263d29d2e..a1995a76e20 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java
@@ -49,7 +49,7 @@ public final class RequantizePerChannel<U extends TType> extends RawOp {
    * @return a new instance of RequantizePerChannel
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> RequantizePerChannel<U> create(Scope scope, Operand<T> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Operand<TFloat32> requestedOutputMin, Operand<TFloat32> requestedOutputMax, Class<U> outType) {
+  public static <U extends TType> RequantizePerChannel<U> create(Scope scope, Operand<? extends TType> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Operand<TFloat32> requestedOutputMin, Operand<TFloat32> requestedOutputMax, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("RequantizePerChannel", scope.makeOpName("RequantizePerChannel"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java
index 8c0d4238d3f..8c5bc8344fa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java
@@ -68,7 +68,7 @@ public final class SegmentMax<T extends TNumber> extends RawOp implements Operan
    * @return a new instance of SegmentMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> SegmentMax<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds) {
+  public static <T extends TNumber> SegmentMax<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds) {
     OperationBuilder opBuilder = scope.env().opBuilder("SegmentMax", scope.makeOpName("SegmentMax"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java
index fd0fd5ca9dd..558a027606a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java
@@ -70,7 +70,7 @@ public final class SegmentMean<T extends TType> extends RawOp implements Operand
    * @return a new instance of SegmentMean
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SegmentMean<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds) {
+  public static <T extends TType> SegmentMean<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds) {
     OperationBuilder opBuilder = scope.env().opBuilder("SegmentMean", scope.makeOpName("SegmentMean"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java
index 19ab9059871..5b8b768ac75 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java
@@ -68,7 +68,7 @@ public final class SegmentMin<T extends TNumber> extends RawOp implements Operan
    * @return a new instance of SegmentMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> SegmentMin<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds) {
+  public static <T extends TNumber> SegmentMin<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds) {
     OperationBuilder opBuilder = scope.env().opBuilder("SegmentMin", scope.makeOpName("SegmentMin"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java
index 9fb8e26c721..ff79fb6fa8a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java
@@ -69,7 +69,7 @@ public final class SegmentProd<T extends TType> extends RawOp implements Operand
    * @return a new instance of SegmentProd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SegmentProd<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds) {
+  public static <T extends TType> SegmentProd<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds) {
     OperationBuilder opBuilder = scope.env().opBuilder("SegmentProd", scope.makeOpName("SegmentProd"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java
index 708d4e7d000..e86b3a55469 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java
@@ -69,7 +69,7 @@ public final class SegmentSum<T extends TType> extends RawOp implements Operand<
    * @return a new instance of SegmentSum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SegmentSum<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds) {
+  public static <T extends TType> SegmentSum<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds) {
     OperationBuilder opBuilder = scope.env().opBuilder("SegmentSum", scope.makeOpName("SegmentSum"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java
index efaaf2dea96..cdfc300c790 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java
@@ -76,7 +76,7 @@ public final class UnsortedSegmentMax<T extends TNumber> extends RawOp implement
    * @return a new instance of UnsortedSegmentMax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber> UnsortedSegmentMax<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds, Operand<V> numSegments) {
+  public static <T extends TNumber> UnsortedSegmentMax<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentMax", scope.makeOpName("UnsortedSegmentMax"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java
index e73ec14aa1b..080e45d9608 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java
@@ -70,7 +70,7 @@ public final class UnsortedSegmentMin<T extends TNumber> extends RawOp implement
    * @return a new instance of UnsortedSegmentMin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber> UnsortedSegmentMin<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds, Operand<V> numSegments) {
+  public static <T extends TNumber> UnsortedSegmentMin<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentMin", scope.makeOpName("UnsortedSegmentMin"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java
index 8dfa3b48922..992f1863978 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java
@@ -70,7 +70,7 @@ public final class UnsortedSegmentProd<T extends TType> extends RawOp implements
    * @return a new instance of UnsortedSegmentProd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber, V extends TNumber> UnsortedSegmentProd<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds, Operand<V> numSegments) {
+  public static <T extends TType> UnsortedSegmentProd<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentProd", scope.makeOpName("UnsortedSegmentProd"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java
index 06441ef1d6d..a5fbc0acbe2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java
@@ -73,7 +73,7 @@ public final class UnsortedSegmentSum<T extends TType> extends RawOp implements
    * @return a new instance of UnsortedSegmentSum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber, V extends TNumber> UnsortedSegmentSum<T> create(Scope scope, Operand<T> data, Operand<U> segmentIds, Operand<V> numSegments) {
+  public static <T extends TType> UnsortedSegmentSum<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentSum", scope.makeOpName("UnsortedSegmentSum"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java
index 0d6c1792495..eb4a0460a65 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java
@@ -90,7 +90,7 @@ private Options() {
    * @return a new instance of Conv3dBackpropInput
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> Conv3dBackpropInput<U> create(Scope scope, Operand<T> inputSizes, Operand<U> filter, Operand<U> outBackprop, List<Long> strides, String padding, Options... options) {
+  public static <U extends TNumber> Conv3dBackpropInput<U> create(Scope scope, Operand<? extends TNumber> inputSizes, Operand<U> filter, Operand<U> outBackprop, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Conv3DBackpropInputV2", scope.makeOpName("Conv3dBackpropInput"));
     opBuilder.addInput(inputSizes.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java
index 5b4af53845d..9c01c23db6d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of MaxPoolGradGradWithArgmax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> MaxPoolGradGradWithArgmax<T> create(Scope scope, Operand<T> input, Operand<T> grad, Operand<U> argmax, List<Long> ksize, List<Long> strides, String padding, Options... options) {
+  public static <T extends TNumber> MaxPoolGradGradWithArgmax<T> create(Scope scope, Operand<T> input, Operand<T> grad, Operand<? extends TNumber> argmax, List<Long> ksize, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolGradGradWithArgmax", scope.makeOpName("MaxPoolGradGradWithArgmax"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(grad.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java
index ef9af71cb95..c07cb6f16a5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java
@@ -70,7 +70,7 @@ private Options() {
    * @return a new instance of MaxPoolGradWithArgmax
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> MaxPoolGradWithArgmax<T> create(Scope scope, Operand<T> input, Operand<T> grad, Operand<U> argmax, List<Long> ksize, List<Long> strides, String padding, Options... options) {
+  public static <T extends TNumber> MaxPoolGradWithArgmax<T> create(Scope scope, Operand<T> input, Operand<T> grad, Operand<? extends TNumber> argmax, List<Long> ksize, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolGradWithArgmax", scope.makeOpName("MaxPoolGradWithArgmax"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(grad.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java
index 05e2ec67aa5..b0aeac360c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java
@@ -53,7 +53,7 @@ public final class QuantizedBiasAdd<V extends TType> extends RawOp {
    * @return a new instance of QuantizedBiasAdd
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedBiasAdd<V> create(Scope scope, Operand<T> input, Operand<U> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minBias, Operand<TFloat32> maxBias, Class<V> outType) {
+  public static <V extends TType> QuantizedBiasAdd<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minBias, Operand<TFloat32> maxBias, Class<V> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedBiasAdd", scope.makeOpName("QuantizedBiasAdd"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(bias.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java
index 89aee4bd5f5..fecb450e7da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java
@@ -80,7 +80,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DAndRelu
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedConv2DAndRelu<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedConv2DAndRelu<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndRelu", scope.makeOpName("QuantizedConv2DAndRelu"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java
index 513a9b240e5..b1408decd0f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java
@@ -82,7 +82,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DAndReluAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedConv2DAndReluAndRequantize<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedConv2DAndReluAndRequantize<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndReluAndRequantize", scope.makeOpName("QuantizedConv2DAndReluAndRequantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java
index 80a1ddf146a..5ed39bd2375 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java
@@ -82,7 +82,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedConv2DAndRequantize<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedConv2DAndRequantize<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndRequantize", scope.makeOpName("QuantizedConv2DAndRequantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java
index f51143d15be..d8f5b063d73 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java
@@ -73,7 +73,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DPerChannel
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedConv2DPerChannel<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedConv2DPerChannel<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DPerChannel", scope.makeOpName("QuantizedConv2DPerChannel"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java
index c579e306102..4effcf06f22 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java
@@ -81,7 +81,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DWithBias
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedConv2DWithBias<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedConv2DWithBias<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBias", scope.makeOpName("QuantizedConv2DWithBias"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java
index ac9672e9f94..39764e1f273 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java
@@ -81,7 +81,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DWithBiasAndRelu
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedConv2DWithBiasAndRelu<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedConv2DWithBiasAndRelu<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndRelu", scope.makeOpName("QuantizedConv2DWithBiasAndRelu"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java
index 084f211be2c..de31b007153 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java
@@ -83,7 +83,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DWithBiasAndReluAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TType, T extends TType, U extends TType, V extends TType> QuantizedConv2DWithBiasAndReluAndRequantize<W> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<V> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding, Options... options) {
+  public static <W extends TType> QuantizedConv2DWithBiasAndReluAndRequantize<W> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<? extends TType> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasAndReluAndRequantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java
index 9a31f82454b..59d1f4cbfaf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java
@@ -83,7 +83,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DWithBiasAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TType, T extends TType, U extends TType, V extends TType> QuantizedConv2DWithBiasAndRequantize<W> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<V> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding, Options... options) {
+  public static <W extends TType> QuantizedConv2DWithBiasAndRequantize<W> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<? extends TType> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasAndRequantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java
index 5d005ac1f9e..e9a27a0679f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java
@@ -86,7 +86,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DWithBiasSignedSumAndReluAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <X extends TType, T extends TType, U extends TType, V extends TType, W extends TType> QuantizedConv2DWithBiasSignedSumAndReluAndRequantize<X> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<V> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Operand<W> summand, Operand<TFloat32> minSummand, Operand<TFloat32> maxSummand, Class<X> outType, List<Long> strides, String padding, Options... options) {
+  public static <X extends TType> QuantizedConv2DWithBiasSignedSumAndReluAndRequantize<X> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<? extends TType> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Operand<? extends TType> summand, Operand<TFloat32> minSummand, Operand<TFloat32> maxSummand, Class<X> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSignedSumAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasSignedSumAndReluAndRequantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java
index dffeac89c25..7bcd90b13fd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java
@@ -82,7 +82,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DWithBiasSumAndRelu
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedConv2DWithBiasSumAndRelu<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> summand, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedConv2DWithBiasSumAndRelu<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> summand, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSumAndRelu", scope.makeOpName("QuantizedConv2DWithBiasSumAndRelu"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java
index 68052783adb..5a6d223be7c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java
@@ -86,7 +86,7 @@ private Options() {
    * @return a new instance of QuantizedConv2DWithBiasSumAndReluAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <X extends TType, T extends TType, U extends TType, V extends TType, W extends TType> QuantizedConv2DWithBiasSumAndReluAndRequantize<X> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<V> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Operand<W> summand, Operand<TFloat32> minSummand, Operand<TFloat32> maxSummand, Class<X> outType, List<Long> strides, String padding, Options... options) {
+  public static <X extends TType> QuantizedConv2DWithBiasSumAndReluAndRequantize<X> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<? extends TType> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Operand<? extends TType> summand, Operand<TFloat32> minSummand, Operand<TFloat32> maxSummand, Class<X> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSumAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasSumAndReluAndRequantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java
index 6e6788db7aa..58a1a2a36e6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java
@@ -84,7 +84,7 @@ private Options() {
    * @return a new instance of QuantizedConv2d
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedConv2d<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedConv2d<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2D", scope.makeOpName("QuantizedConv2d"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java
index 7dae76d87bc..17695f4fb77 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java
@@ -73,7 +73,7 @@ private Options() {
    * @return a new instance of QuantizedDepthwiseConv2D
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedDepthwiseConv2D<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedDepthwiseConv2D<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2D", scope.makeOpName("QuantizedDepthwiseConv2D"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java
index fc7f07525af..7f37dff79d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java
@@ -74,7 +74,7 @@ private Options() {
    * @return a new instance of QuantizedDepthwiseConv2DWithBias
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedDepthwiseConv2DWithBias<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedDepthwiseConv2DWithBias<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBias", scope.makeOpName("QuantizedDepthwiseConv2DWithBias"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java
index c16b3c91a0e..46c8ded50f0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java
@@ -83,7 +83,7 @@ private Options() {
    * @return a new instance of QuantizedDepthwiseConv2DWithBiasAndRelu
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TType, T extends TType, U extends TType> QuantizedDepthwiseConv2DWithBiasAndRelu<V> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
+  public static <V extends TType> QuantizedDepthwiseConv2DWithBiasAndRelu<V> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<TFloat32> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBiasAndRelu", scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndRelu"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java
index 02dccc28354..ee9b29129bc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java
@@ -85,7 +85,7 @@ private Options() {
    * @return a new instance of QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TType, T extends TType, U extends TType, V extends TType> QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize<W> create(Scope scope, Operand<T> input, Operand<U> filter, Operand<V> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding, Options... options) {
+  public static <W extends TType> QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize<W> create(Scope scope, Operand<? extends TType> input, Operand<? extends TType> filter, Operand<? extends TType> bias, Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java
index 56b755f2a71..578b994a3d4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java
@@ -48,7 +48,7 @@ public final class QuantizedRelu<U extends TType> extends RawOp {
    * @return a new instance of QuantizedRelu
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> QuantizedRelu<U> create(Scope scope, Operand<T> features, Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
+  public static <U extends TType> QuantizedRelu<U> create(Scope scope, Operand<? extends TType> features, Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedRelu", scope.makeOpName("QuantizedRelu"));
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(minFeatures.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java
index 2f99d1ab861..4ee22f51238 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java
@@ -48,7 +48,7 @@ public final class QuantizedRelu6<U extends TType> extends RawOp {
    * @return a new instance of QuantizedRelu6
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> QuantizedRelu6<U> create(Scope scope, Operand<T> features, Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
+  public static <U extends TType> QuantizedRelu6<U> create(Scope scope, Operand<? extends TType> features, Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedRelu6", scope.makeOpName("QuantizedRelu6"));
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(minFeatures.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java
index afd943b7595..cf9bdc3134e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java
@@ -49,7 +49,7 @@ public final class QuantizedReluX<U extends TType> extends RawOp {
    * @return a new instance of QuantizedReluX
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> QuantizedReluX<U> create(Scope scope, Operand<T> features, Operand<TFloat32> maxValue, Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
+  public static <U extends TType> QuantizedReluX<U> create(Scope scope, Operand<? extends TType> features, Operand<TFloat32> maxValue, Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedReluX", scope.makeOpName("QuantizedReluX"));
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(maxValue.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java
index edc741c19ac..90afda30fe4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java
@@ -122,7 +122,7 @@ public final class SpaceToBatch<T extends TType> extends RawOp implements Operan
    * @return a new instance of SpaceToBatch
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SpaceToBatch<T> create(Scope scope, Operand<T> input, Operand<U> paddings, Long blockSize) {
+  public static <T extends TType> SpaceToBatch<T> create(Scope scope, Operand<T> input, Operand<? extends TNumber> paddings, Long blockSize) {
     OperationBuilder opBuilder = scope.env().opBuilder("SpaceToBatch", scope.makeOpName("SpaceToBatch"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SparseSoftmaxCrossEntropyWithLogits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SparseSoftmaxCrossEntropyWithLogits.java
index 6cbd4fddeb1..67650760b1c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SparseSoftmaxCrossEntropyWithLogits.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SparseSoftmaxCrossEntropyWithLogits.java
@@ -52,7 +52,7 @@ public final class SparseSoftmaxCrossEntropyWithLogits<T extends TNumber> extend
    * @return a new instance of SparseSoftmaxCrossEntropyWithLogits
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> SparseSoftmaxCrossEntropyWithLogits<T> create(Scope scope, Operand<T> features, Operand<U> labels) {
+  public static <T extends TNumber> SparseSoftmaxCrossEntropyWithLogits<T> create(Scope scope, Operand<T> features, Operand<? extends TNumber> labels) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSoftmaxCrossEntropyWithLogits", scope.makeOpName("SparseSoftmaxCrossEntropyWithLogits"));
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(labels.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java
index 19c738bc721..ff6b734970b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java
@@ -137,7 +137,7 @@ private Options() {
    * @return a new instance of Dequantize
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Dequantize<U> create(Scope scope, Operand<T> input, Operand<TFloat32> minRange, Operand<TFloat32> maxRange, Class<U> dtype, Options... options) {
+  public static <U extends TNumber> Dequantize<U> create(Scope scope, Operand<? extends TType> input, Operand<TFloat32> minRange, Operand<TFloat32> maxRange, Class<U> dtype, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Dequantize", scope.makeOpName("Dequantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(minRange.asOutput());
@@ -171,7 +171,7 @@ public static <U extends TNumber, T extends TType> Dequantize<U> create(Scope sc
    * @return a new instance of Dequantize
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Dequantize<TFloat32> create(Scope scope, Operand<T> input, Operand<TFloat32> minRange, Operand<TFloat32> maxRange, Options... options) {
+  public static Dequantize<TFloat32> create(Scope scope, Operand<? extends TType> input, Operand<TFloat32> minRange, Operand<TFloat32> maxRange, Options... options) {
     return create(scope, input, minRange, maxRange, TFloat32.class, options);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java
index 5430dbc69ca..73f23d05195 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java
@@ -71,7 +71,7 @@ public final class QuantizeDownAndShrinkRange<U extends TType> extends RawOp {
    * @return a new instance of QuantizeDownAndShrinkRange
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> QuantizeDownAndShrinkRange<U> create(Scope scope, Operand<T> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Class<U> outType) {
+  public static <U extends TType> QuantizeDownAndShrinkRange<U> create(Scope scope, Operand<? extends TType> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizeDownAndShrinkRange", scope.makeOpName("QuantizeDownAndShrinkRange"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java
index e925c15546b..d603f188f71 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java
@@ -90,7 +90,7 @@ private Options() {
    * @return a new instance of QuantizedMatMulWithBiasAndDequantize
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TNumber, T extends TType, U extends TType, V extends TType> QuantizedMatMulWithBiasAndDequantize<W> create(Scope scope, Operand<T> a, Operand<U> b, Operand<V> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
+  public static <W extends TNumber> QuantizedMatMulWithBiasAndDequantize<W> create(Scope scope, Operand<? extends TType> a, Operand<? extends TType> b, Operand<? extends TType> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndDequantize", scope.makeOpName("QuantizedMatMulWithBiasAndDequantize"));
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java
index d971f1a41cf..a4326a3618a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java
@@ -89,7 +89,7 @@ private Options() {
    * @return a new instance of QuantizedMatMulWithBiasAndRequantize
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TType, T extends TType, U extends TType, V extends TType> QuantizedMatMulWithBiasAndRequantize<W> create(Scope scope, Operand<T> a, Operand<U> b, Operand<V> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
+  public static <W extends TType> QuantizedMatMulWithBiasAndRequantize<W> create(Scope scope, Operand<? extends TType> a, Operand<? extends TType> b, Operand<? extends TType> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput, Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndRequantize", scope.makeOpName("QuantizedMatMulWithBiasAndRequantize"));
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java
index 52af93f6383..a38b54f2916 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java
@@ -49,7 +49,7 @@ public final class RequantizationRange extends RawOp {
    * @return a new instance of RequantizationRange
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> RequantizationRange create(Scope scope, Operand<T> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
+  public static RequantizationRange create(Scope scope, Operand<? extends TType> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
     OperationBuilder opBuilder = scope.env().opBuilder("RequantizationRange", scope.makeOpName("RequantizationRange"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java
index cec1e8823e4..6a18daf69ca 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java
@@ -58,7 +58,7 @@ public final class Requantize<U extends TType> extends RawOp {
    * @return a new instance of Requantize
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> Requantize<U> create(Scope scope, Operand<T> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Operand<TFloat32> requestedOutputMin, Operand<TFloat32> requestedOutputMax, Class<U> outType) {
+  public static <U extends TType> Requantize<U> create(Scope scope, Operand<? extends TType> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Operand<TFloat32> requestedOutputMin, Operand<TFloat32> requestedOutputMax, Class<U> outType) {
     OperationBuilder opBuilder = scope.env().opBuilder("Requantize", scope.makeOpName("Requantize"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java
index 857d412129f..f9701def261 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java
@@ -78,7 +78,7 @@ private Options() {
    * @return a new instance of RaggedCountSparseOutput
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> RaggedCountSparseOutput<U> create(Scope scope, Operand<TInt64> splits, Operand<T> values, Operand<U> weights, Boolean binaryOutput, Options... options) {
+  public static <U extends TNumber> RaggedCountSparseOutput<U> create(Scope scope, Operand<TInt64> splits, Operand<? extends TNumber> values, Operand<U> weights, Boolean binaryOutput, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("RaggedCountSparseOutput", scope.makeOpName("RaggedCountSparseOutput"));
     opBuilder.addInput(splits.asOutput());
     opBuilder.addInput(values.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java
index bd027000139..8cfbba1894d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java
@@ -84,7 +84,7 @@ public final class RaggedGather<T extends TNumber, U extends TType> extends RawO
    * @return a new instance of RaggedGather
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType, V extends TNumber> RaggedGather<T, U> create(Scope scope, Iterable<Operand<T>> paramsNestedSplits, Operand<U> paramsDenseValues, Operand<V> indices, Long OUTPUTRAGGEDRANK) {
+  public static <T extends TNumber, U extends TType> RaggedGather<T, U> create(Scope scope, Iterable<Operand<T>> paramsNestedSplits, Operand<U> paramsDenseValues, Operand<? extends TNumber> indices, Long OUTPUTRAGGEDRANK) {
     OperationBuilder opBuilder = scope.env().opBuilder("RaggedGather", scope.makeOpName("RaggedGather"));
     opBuilder.addInputList(Operands.asOutputs(paramsNestedSplits));
     opBuilder.addInput(paramsDenseValues.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java
index 6849b77593f..5fdddc476b7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java
@@ -106,7 +106,7 @@ public final class RaggedTensorToTensor<U extends TType> extends RawOp implement
    * @return a new instance of RaggedTensorToTensor
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber, V extends TNumber> RaggedTensorToTensor<U> create(Scope scope, Operand<T> shape, Operand<U> values, Operand<U> defaultValue, Iterable<Operand<V>> rowPartitionTensors, List<String> rowPartitionTypes) {
+  public static <U extends TType, V extends TNumber> RaggedTensorToTensor<U> create(Scope scope, Operand<? extends TNumber> shape, Operand<U> values, Operand<U> defaultValue, Iterable<Operand<V>> rowPartitionTensors, List<String> rowPartitionTypes) {
     OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorToTensor", scope.makeOpName("RaggedTensorToTensor"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(values.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java
index d2f890dbefb..fa4799f3513 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java
@@ -58,7 +58,7 @@ public final class RaggedTensorToVariant extends RawOp implements Operand<TType>
    * @return a new instance of RaggedTensorToVariant
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TType> RaggedTensorToVariant create(Scope scope, Iterable<Operand<T>> rtNestedSplits, Operand<U> rtDenseValues, Boolean batchedInput) {
+  public static <T extends TNumber> RaggedTensorToVariant create(Scope scope, Iterable<Operand<T>> rtNestedSplits, Operand<? extends TType> rtDenseValues, Boolean batchedInput) {
     OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorToVariant", scope.makeOpName("RaggedTensorToVariant"));
     opBuilder.addInputList(Operands.asOutputs(rtNestedSplits));
     opBuilder.addInput(rtDenseValues.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java
index 5dc566feb29..2122358b803 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java
@@ -79,7 +79,7 @@ private Options() {
    * @return a new instance of Multinomial
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> Multinomial<U> create(Scope scope, Operand<T> logits, Operand<TInt32> numSamples, Class<U> outputDtype, Options... options) {
+  public static <U extends TNumber> Multinomial<U> create(Scope scope, Operand<? extends TNumber> logits, Operand<TInt32> numSamples, Class<U> outputDtype, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Multinomial", scope.makeOpName("Multinomial"));
     opBuilder.addInput(logits.asOutput());
     opBuilder.addInput(numSamples.asOutput());
@@ -109,7 +109,7 @@ public static <U extends TNumber, T extends TNumber> Multinomial<U> create(Scope
    * @return a new instance of Multinomial
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> Multinomial<TInt64> create(Scope scope, Operand<T> logits, Operand<TInt32> numSamples, Options... options) {
+  public static Multinomial<TInt64> create(Scope scope, Operand<? extends TNumber> logits, Operand<TInt32> numSamples, Options... options) {
     return create(scope, logits, numSamples, TInt64.class, options);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java
index 2f9aad878b3..ea189d9d7aa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java
@@ -47,7 +47,7 @@ public final class NonDeterministicInts<U extends TType> extends RawOp implement
    * @return a new instance of NonDeterministicInts
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> NonDeterministicInts<U> create(Scope scope, Operand<T> shape, Class<U> dtype) {
+  public static <U extends TType> NonDeterministicInts<U> create(Scope scope, Operand<? extends TType> shape, Class<U> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("NonDeterministicInts", scope.makeOpName("NonDeterministicInts"));
     opBuilder.addInput(shape.asOutput());
     opBuilder = scope.apply(opBuilder);
@@ -63,7 +63,7 @@ public static <U extends TType, T extends TType> NonDeterministicInts<U> create(
    * @return a new instance of NonDeterministicInts
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> NonDeterministicInts<TInt64> create(Scope scope, Operand<T> shape) {
+  public static NonDeterministicInts<TInt64> create(Scope scope, Operand<? extends TType> shape) {
     return create(scope, shape, TInt64.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java
index f4300ebaa75..1daadb4a445 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java
@@ -82,7 +82,7 @@ private Options() {
    * @return a new instance of ParameterizedTruncatedNormal
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> ParameterizedTruncatedNormal<U> create(Scope scope, Operand<T> shape, Operand<U> means, Operand<U> stdevs, Operand<U> minvals, Operand<U> maxvals, Options... options) {
+  public static <U extends TNumber> ParameterizedTruncatedNormal<U> create(Scope scope, Operand<? extends TNumber> shape, Operand<U> means, Operand<U> stdevs, Operand<U> minvals, Operand<U> maxvals, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ParameterizedTruncatedNormal", scope.makeOpName("ParameterizedTruncatedNormal"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(means.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java
index ddf132eacb8..7457dd6b1c8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java
@@ -81,7 +81,7 @@ private Options() {
    * @return a new instance of RandomGamma
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> RandomGamma<U> create(Scope scope, Operand<T> shape, Operand<U> alpha, Options... options) {
+  public static <U extends TNumber> RandomGamma<U> create(Scope scope, Operand<? extends TNumber> shape, Operand<U> alpha, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("RandomGamma", scope.makeOpName("RandomGamma"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(alpha.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java
index 8b3c70059e0..6d9632c1b73 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java
@@ -90,7 +90,7 @@ private Options() {
    * @return a new instance of RandomPoisson
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> RandomPoisson<V> create(Scope scope, Operand<T> shape, Operand<U> rate, Class<V> dtype, Options... options) {
+  public static <V extends TNumber> RandomPoisson<V> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> rate, Class<V> dtype, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("RandomPoissonV2", scope.makeOpName("RandomPoisson"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(rate.asOutput());
@@ -121,7 +121,7 @@ public static <V extends TNumber, T extends TNumber, U extends TNumber> RandomPo
    * @return a new instance of RandomPoisson
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> RandomPoisson<TInt64> create(Scope scope, Operand<T> shape, Operand<U> rate, Options... options) {
+  public static RandomPoisson<TInt64> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> rate, Options... options) {
     return create(scope, shape, rate, TInt64.class, options);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java
index c699ec4509c..5590f39e462 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java
@@ -78,7 +78,7 @@ private Options() {
    * @return a new instance of RandomStandardNormal
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> RandomStandardNormal<U> create(Scope scope, Operand<T> shape, Class<U> dtype, Options... options) {
+  public static <U extends TNumber> RandomStandardNormal<U> create(Scope scope, Operand<? extends TNumber> shape, Class<U> dtype, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("RandomStandardNormal", scope.makeOpName("RandomStandardNormal"));
     opBuilder.addInput(shape.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java
index d3bbe991d60..ee3d57fe528 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java
@@ -79,7 +79,7 @@ private Options() {
    * @return a new instance of RandomUniform
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> RandomUniform<U> create(Scope scope, Operand<T> shape, Class<U> dtype, Options... options) {
+  public static <U extends TNumber> RandomUniform<U> create(Scope scope, Operand<? extends TNumber> shape, Class<U> dtype, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("RandomUniform", scope.makeOpName("RandomUniform"));
     opBuilder.addInput(shape.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java
index f6ab24df811..fa63412d74a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java
@@ -84,7 +84,7 @@ private Options() {
    * @return a new instance of RandomUniformInt
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> RandomUniformInt<U> create(Scope scope, Operand<T> shape, Operand<U> minval, Operand<U> maxval, Options... options) {
+  public static <U extends TNumber> RandomUniformInt<U> create(Scope scope, Operand<? extends TNumber> shape, Operand<U> minval, Operand<U> maxval, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("RandomUniformInt", scope.makeOpName("RandomUniformInt"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(minval.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java
index 67264028253..f0ca988f977 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java
@@ -48,7 +48,7 @@ public final class StatefulRandomBinomial<V extends TNumber> extends RawOp imple
    * @return a new instance of StatefulRandomBinomial
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatefulRandomBinomial<V> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Operand<U> counts, Operand<U> probs, Class<V> dtype) {
+  public static <V extends TNumber, U extends TNumber> StatefulRandomBinomial<V> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TNumber> shape, Operand<U> counts, Operand<U> probs, Class<V> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatefulRandomBinomial", scope.makeOpName("StatefulRandomBinomial"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
@@ -72,7 +72,7 @@ public static <V extends TNumber, T extends TNumber, U extends TNumber> Stateful
    * @return a new instance of StatefulRandomBinomial
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> StatefulRandomBinomial<TInt64> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Operand<U> counts, Operand<U> probs) {
+  public static <U extends TNumber> StatefulRandomBinomial<TInt64> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TNumber> shape, Operand<U> counts, Operand<U> probs) {
     return create(scope, resource, algorithm, shape, counts, probs, TInt64.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java
index 340703444ef..f2bac599e30 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java
@@ -51,7 +51,7 @@ public final class StatefulStandardNormal<U extends TType> extends RawOp impleme
    * @return a new instance of StatefulStandardNormal
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> StatefulStandardNormal<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Class<U> dtype) {
+  public static <U extends TType> StatefulStandardNormal<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape, Class<U> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatefulStandardNormalV2", scope.makeOpName("StatefulStandardNormal"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
@@ -71,7 +71,7 @@ public static <U extends TType, T extends TType> StatefulStandardNormal<U> creat
    * @return a new instance of StatefulStandardNormal
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> StatefulStandardNormal<TFloat32> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape) {
+  public static StatefulStandardNormal<TFloat32> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape) {
     return create(scope, resource, algorithm, shape, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java
index 850473f7662..8674dbfd845 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java
@@ -52,7 +52,7 @@ public final class StatefulTruncatedNormal<U extends TType> extends RawOp implem
    * @return a new instance of StatefulTruncatedNormal
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> StatefulTruncatedNormal<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Class<U> dtype) {
+  public static <U extends TType> StatefulTruncatedNormal<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape, Class<U> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatefulTruncatedNormal", scope.makeOpName("StatefulTruncatedNormal"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
@@ -72,7 +72,7 @@ public static <U extends TType, T extends TType> StatefulTruncatedNormal<U> crea
    * @return a new instance of StatefulTruncatedNormal
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> StatefulTruncatedNormal<TFloat32> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape) {
+  public static StatefulTruncatedNormal<TFloat32> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape) {
     return create(scope, resource, algorithm, shape, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java
index b33ced6beec..b7e5f2b461d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java
@@ -51,7 +51,7 @@ public final class StatefulUniform<U extends TType> extends RawOp implements Ope
    * @return a new instance of StatefulUniform
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> StatefulUniform<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Class<U> dtype) {
+  public static <U extends TType> StatefulUniform<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape, Class<U> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatefulUniform", scope.makeOpName("StatefulUniform"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
@@ -71,7 +71,7 @@ public static <U extends TType, T extends TType> StatefulUniform<U> create(Scope
    * @return a new instance of StatefulUniform
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> StatefulUniform<TFloat32> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape) {
+  public static StatefulUniform<TFloat32> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape) {
     return create(scope, resource, algorithm, shape, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java
index 6a06923808a..00cd668c7e5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java
@@ -49,7 +49,7 @@ public final class StatefulUniformFullInt<U extends TType> extends RawOp impleme
    * @return a new instance of StatefulUniformFullInt
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> StatefulUniformFullInt<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Class<U> dtype) {
+  public static <U extends TType> StatefulUniformFullInt<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape, Class<U> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatefulUniformFullInt", scope.makeOpName("StatefulUniformFullInt"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java
index b8212de6e03..880b414d875 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java
@@ -55,7 +55,7 @@ public final class StatefulUniformInt<U extends TType> extends RawOp implements
    * @return a new instance of StatefulUniformInt
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> StatefulUniformInt<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<T> shape, Operand<U> minval, Operand<U> maxval) {
+  public static <U extends TType> StatefulUniformInt<U> create(Scope scope, Operand<?> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape, Operand<U> minval, Operand<U> maxval) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatefulUniformInt", scope.makeOpName("StatefulUniformInt"));
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java
index 93f7a9254de..aa8a31e7f38 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java
@@ -50,7 +50,7 @@ public final class StatelessMultinomial<V extends TNumber> extends RawOp impleme
    * @return a new instance of StatelessMultinomial
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatelessMultinomial<V> create(Scope scope, Operand<T> logits, Operand<TInt32> numSamples, Operand<U> seed, Class<V> outputDtype) {
+  public static <V extends TNumber> StatelessMultinomial<V> create(Scope scope, Operand<? extends TNumber> logits, Operand<TInt32> numSamples, Operand<? extends TNumber> seed, Class<V> outputDtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessMultinomial", scope.makeOpName("StatelessMultinomial"));
     opBuilder.addInput(logits.asOutput());
     opBuilder.addInput(numSamples.asOutput());
@@ -71,7 +71,7 @@ public static <V extends TNumber, T extends TNumber, U extends TNumber> Stateles
    * @return a new instance of StatelessMultinomial
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> StatelessMultinomial<TInt64> create(Scope scope, Operand<T> logits, Operand<TInt32> numSamples, Operand<U> seed) {
+  public static StatelessMultinomial<TInt64> create(Scope scope, Operand<? extends TNumber> logits, Operand<TInt32> numSamples, Operand<? extends TNumber> seed) {
     return create(scope, logits, numSamples, seed, TInt64.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java
index f6d5deadabf..8c740f16994 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java
@@ -46,7 +46,7 @@ public final class StatelessParameterizedTruncatedNormal<V extends TNumber> exte
    * @return a new instance of StatelessParameterizedTruncatedNormal
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatelessParameterizedTruncatedNormal<V> create(Scope scope, Operand<T> shape, Operand<U> seed, Operand<V> means, Operand<V> stddevs, Operand<V> minvals, Operand<V> maxvals) {
+  public static <V extends TNumber> StatelessParameterizedTruncatedNormal<V> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<V> means, Operand<V> stddevs, Operand<V> minvals, Operand<V> maxvals) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessParameterizedTruncatedNormal", scope.makeOpName("StatelessParameterizedTruncatedNormal"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java
index 6da606468d1..0b1e081e551 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java
@@ -54,7 +54,7 @@ public final class StatelessRandomBinomial<W extends TNumber> extends RawOp impl
    * @return a new instance of StatelessRandomBinomial
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TNumber, T extends TNumber, U extends TNumber, V extends TNumber> StatelessRandomBinomial<W> create(Scope scope, Operand<T> shape, Operand<U> seed, Operand<V> counts, Operand<V> probs, Class<W> dtype) {
+  public static <W extends TNumber, V extends TNumber> StatelessRandomBinomial<W> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<V> counts, Operand<V> probs, Class<W> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomBinomial", scope.makeOpName("StatelessRandomBinomial"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
@@ -78,7 +78,7 @@ public static <W extends TNumber, T extends TNumber, U extends TNumber, V extend
    * @return a new instance of StatelessRandomBinomial
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber> StatelessRandomBinomial<TInt64> create(Scope scope, Operand<T> shape, Operand<U> seed, Operand<V> counts, Operand<V> probs) {
+  public static <V extends TNumber> StatelessRandomBinomial<TInt64> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<V> counts, Operand<V> probs) {
     return create(scope, shape, seed, counts, probs, TInt64.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java
index 2b4ca37dee9..3665612e654 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java
@@ -49,7 +49,7 @@ public final class StatelessRandomGamma<V extends TNumber> extends RawOp impleme
    * @return a new instance of StatelessRandomGamma
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandomGamma<V> create(Scope scope, Operand<T> shape, Operand<U> seed, Operand<V> alpha) {
+  public static <V extends TNumber> StatelessRandomGamma<V> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<V> alpha) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomGammaV2", scope.makeOpName("StatelessRandomGamma"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java
index 6438b29ec4c..21587fa0ff0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java
@@ -51,7 +51,7 @@ public final class StatelessRandomNormal<V extends TNumber> extends RawOp implem
    * @return a new instance of StatelessRandomNormal
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandomNormal<V> create(Scope scope, Operand<T> shape, Operand<U> seed, Class<V> dtype) {
+  public static <V extends TNumber> StatelessRandomNormal<V> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomNormal", scope.makeOpName("StatelessRandomNormal"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
@@ -69,7 +69,7 @@ public static <V extends TNumber, T extends TNumber, U extends TNumber> Stateles
    * @return a new instance of StatelessRandomNormal
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> StatelessRandomNormal<TFloat32> create(Scope scope, Operand<T> shape, Operand<U> seed) {
+  public static StatelessRandomNormal<TFloat32> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed) {
     return create(scope, shape, seed, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java
index c44af6a5e72..2c0f4b988bc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java
@@ -51,7 +51,7 @@ public final class StatelessRandomPoisson<W extends TNumber> extends RawOp imple
    * @return a new instance of StatelessRandomPoisson
    */
   @Endpoint(describeByClass = true)
-  public static <W extends TNumber, T extends TNumber, U extends TNumber, V extends TNumber> StatelessRandomPoisson<W> create(Scope scope, Operand<T> shape, Operand<U> seed, Operand<V> lam, Class<W> dtype) {
+  public static <W extends TNumber> StatelessRandomPoisson<W> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<? extends TNumber> lam, Class<W> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomPoisson", scope.makeOpName("StatelessRandomPoisson"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java
index 814b89ba69c..06a468bb84f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java
@@ -52,7 +52,7 @@ public final class StatelessRandomUniform<V extends TNumber> extends RawOp imple
    * @return a new instance of StatelessRandomUniform
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandomUniform<V> create(Scope scope, Operand<T> shape, Operand<U> seed, Class<V> dtype) {
+  public static <V extends TNumber> StatelessRandomUniform<V> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniform", scope.makeOpName("StatelessRandomUniform"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
@@ -70,7 +70,7 @@ public static <V extends TNumber, T extends TNumber, U extends TNumber> Stateles
    * @return a new instance of StatelessRandomUniform
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> StatelessRandomUniform<TFloat32> create(Scope scope, Operand<T> shape, Operand<U> seed) {
+  public static StatelessRandomUniform<TFloat32> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed) {
     return create(scope, shape, seed, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java
index d90112620a5..87c2d18b556 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java
@@ -49,7 +49,7 @@ public final class StatelessRandomUniformFullInt<V extends TNumber> extends RawO
    * @return a new instance of StatelessRandomUniformFullInt
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandomUniformFullInt<V> create(Scope scope, Operand<T> shape, Operand<U> seed, Class<V> dtype) {
+  public static <V extends TNumber> StatelessRandomUniformFullInt<V> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformFullInt", scope.makeOpName("StatelessRandomUniformFullInt"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java
index fb88cc4f69d..37b882c8c39 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java
@@ -49,7 +49,7 @@ public final class StatelessRandomUniformInt<V extends TNumber> extends RawOp im
    * @return a new instance of StatelessRandomUniformInt
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatelessRandomUniformInt<V> create(Scope scope, Operand<T> shape, Operand<U> seed, Operand<V> minval, Operand<V> maxval) {
+  public static <V extends TNumber> StatelessRandomUniformInt<V> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<V> minval, Operand<V> maxval) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformInt", scope.makeOpName("StatelessRandomUniformInt"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java
index e38cd931564..6550b77b3a9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java
@@ -53,7 +53,7 @@ public final class StatelessTruncatedNormal<V extends TNumber> extends RawOp imp
    * @return a new instance of StatelessTruncatedNormal
    */
   @Endpoint(describeByClass = true)
-  public static <V extends TNumber, T extends TNumber, U extends TNumber> StatelessTruncatedNormal<V> create(Scope scope, Operand<T> shape, Operand<U> seed, Class<V> dtype) {
+  public static <V extends TNumber> StatelessTruncatedNormal<V> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("StatelessTruncatedNormal", scope.makeOpName("StatelessTruncatedNormal"));
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
@@ -71,7 +71,7 @@ public static <V extends TNumber, T extends TNumber, U extends TNumber> Stateles
    * @return a new instance of StatelessTruncatedNormal
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> StatelessTruncatedNormal<TFloat32> create(Scope scope, Operand<T> shape, Operand<U> seed) {
+  public static StatelessTruncatedNormal<TFloat32> create(Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed) {
     return create(scope, shape, seed, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java
index ff111c2e8d1..aa2be6ce8ea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java
@@ -80,7 +80,7 @@ private Options() {
    * @return a new instance of TruncatedNormal
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> TruncatedNormal<U> create(Scope scope, Operand<T> shape, Class<U> dtype, Options... options) {
+  public static <U extends TNumber> TruncatedNormal<U> create(Scope scope, Operand<? extends TNumber> shape, Class<U> dtype, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("TruncatedNormal", scope.makeOpName("TruncatedNormal"));
     opBuilder.addInput(shape.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java
index bd0d2a330ee..f823a9be60c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java
@@ -63,7 +63,7 @@ public final class Irfft<U extends TNumber> extends RawOp implements Operand<U>
    * @return a new instance of Irfft
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Irfft<U> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength, Class<U> Treal) {
+  public static <U extends TNumber> Irfft<U> create(Scope scope, Operand<? extends TType> input, Operand<TInt32> fftLength, Class<U> Treal) {
     OperationBuilder opBuilder = scope.env().opBuilder("IRFFT", scope.makeOpName("Irfft"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
@@ -81,7 +81,7 @@ public static <U extends TNumber, T extends TType> Irfft<U> create(Scope scope,
    * @return a new instance of Irfft
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Irfft<TFloat32> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength) {
+  public static Irfft<TFloat32> create(Scope scope, Operand<? extends TType> input, Operand<TInt32> fftLength) {
     return create(scope, input, fftLength, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java
index 861e7aaf62e..709297f6afe 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java
@@ -64,7 +64,7 @@ public final class Irfft2d<U extends TNumber> extends RawOp implements Operand<U
    * @return a new instance of Irfft2d
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Irfft2d<U> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength, Class<U> Treal) {
+  public static <U extends TNumber> Irfft2d<U> create(Scope scope, Operand<? extends TType> input, Operand<TInt32> fftLength, Class<U> Treal) {
     OperationBuilder opBuilder = scope.env().opBuilder("IRFFT2D", scope.makeOpName("Irfft2d"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
@@ -82,7 +82,7 @@ public static <U extends TNumber, T extends TType> Irfft2d<U> create(Scope scope
    * @return a new instance of Irfft2d
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Irfft2d<TFloat32> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength) {
+  public static Irfft2d<TFloat32> create(Scope scope, Operand<? extends TType> input, Operand<TInt32> fftLength) {
     return create(scope, input, fftLength, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java
index d68a0904eff..c30315d1e7b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java
@@ -64,7 +64,7 @@ public final class Irfft3d<U extends TNumber> extends RawOp implements Operand<U
    * @return a new instance of Irfft3d
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TType> Irfft3d<U> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength, Class<U> Treal) {
+  public static <U extends TNumber> Irfft3d<U> create(Scope scope, Operand<? extends TType> input, Operand<TInt32> fftLength, Class<U> Treal) {
     OperationBuilder opBuilder = scope.env().opBuilder("IRFFT3D", scope.makeOpName("Irfft3d"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
@@ -82,7 +82,7 @@ public static <U extends TNumber, T extends TType> Irfft3d<U> create(Scope scope
    * @return a new instance of Irfft3d
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Irfft3d<TFloat32> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength) {
+  public static Irfft3d<TFloat32> create(Scope scope, Operand<? extends TType> input, Operand<TInt32> fftLength) {
     return create(scope, input, fftLength, TFloat32.class);
   }
   
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft.java
index 3b8e54a361e..5ca4fe1c4d5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft.java
@@ -59,7 +59,7 @@ public final class Rfft<U extends TType> extends RawOp implements Operand<U> {
    * @return a new instance of Rfft
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> Rfft<U> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength, Class<U> Tcomplex) {
+  public static <U extends TType> Rfft<U> create(Scope scope, Operand<? extends TNumber> input, Operand<TInt32> fftLength, Class<U> Tcomplex) {
     OperationBuilder opBuilder = scope.env().opBuilder("RFFT", scope.makeOpName("Rfft"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft2d.java
index cf00ae1b33b..483d26a898f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft2d.java
@@ -60,7 +60,7 @@ public final class Rfft2d<U extends TType> extends RawOp implements Operand<U> {
    * @return a new instance of Rfft2d
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> Rfft2d<U> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength, Class<U> Tcomplex) {
+  public static <U extends TType> Rfft2d<U> create(Scope scope, Operand<? extends TNumber> input, Operand<TInt32> fftLength, Class<U> Tcomplex) {
     OperationBuilder opBuilder = scope.env().opBuilder("RFFT2D", scope.makeOpName("Rfft2d"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft3d.java
index c01d979d7cb..cf64fceea54 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft3d.java
@@ -60,7 +60,7 @@ public final class Rfft3d<U extends TType> extends RawOp implements Operand<U> {
    * @return a new instance of Rfft3d
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> Rfft3d<U> create(Scope scope, Operand<T> input, Operand<TInt32> fftLength, Class<U> Tcomplex) {
+  public static <U extends TType> Rfft3d<U> create(Scope scope, Operand<? extends TNumber> input, Operand<TInt32> fftLength, Class<U> Tcomplex) {
     OperationBuilder opBuilder = scope.env().opBuilder("RFFT3D", scope.makeOpName("Rfft3d"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java
index 57dd04bb693..b1c834f44f1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java
@@ -98,7 +98,7 @@ private Options() {
    * @return a new instance of AddManySparseToTensorsMap
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> AddManySparseToTensorsMap create(Scope scope, Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape, Options... options) {
+  public static AddManySparseToTensorsMap create(Scope scope, Operand<TInt64> sparseIndices, Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("AddManySparseToTensorsMap", scope.makeOpName("AddManySparseToTensorsMap"));
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java
index 9f6fd118a0d..c8313d66e85 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java
@@ -89,7 +89,7 @@ private Options() {
    * @return a new instance of AddSparseToTensorsMap
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> AddSparseToTensorsMap create(Scope scope, Operand<TInt64> sparseIndices, Operand<T> sparseValues, Operand<TInt64> sparseShape, Options... options) {
+  public static AddSparseToTensorsMap create(Scope scope, Operand<TInt64> sparseIndices, Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("AddSparseToTensorsMap", scope.makeOpName("AddSparseToTensorsMap"));
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java
index c06191594a3..fa956a4032f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java
@@ -77,7 +77,7 @@ private Options() {
    * @return a new instance of DenseCountSparseOutput
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> DenseCountSparseOutput<U> create(Scope scope, Operand<T> values, Operand<U> weights, Boolean binaryOutput, Options... options) {
+  public static <U extends TNumber> DenseCountSparseOutput<U> create(Scope scope, Operand<? extends TNumber> values, Operand<U> weights, Boolean binaryOutput, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("DenseCountSparseOutput", scope.makeOpName("DenseCountSparseOutput"));
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(weights.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java
index f229dd2ad98..82afc01ea47 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java
@@ -89,7 +89,7 @@ public final class DeserializeSparse<U extends TType> extends RawOp {
    * @return a new instance of DeserializeSparse
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TType> DeserializeSparse<U> create(Scope scope, Operand<T> serializedSparse, Class<U> dtype) {
+  public static <U extends TType> DeserializeSparse<U> create(Scope scope, Operand<? extends TType> serializedSparse, Class<U> dtype) {
     OperationBuilder opBuilder = scope.env().opBuilder("DeserializeSparse", scope.makeOpName("DeserializeSparse"));
     opBuilder.addInput(serializedSparse.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java
index 9fbf6a1efdf..94e912c38f8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java
@@ -54,7 +54,7 @@ public final class SparseAccumulatorApplyGradient extends RawOp {
    * @return a new instance of SparseAccumulatorApplyGradient
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> SparseAccumulatorApplyGradient create(Scope scope, Operand<TString> handle, Operand<TInt64> localStep, Operand<TInt64> gradientIndices, Operand<T> gradientValues, Operand<TInt64> gradientShape, Boolean hasKnownShape) {
+  public static SparseAccumulatorApplyGradient create(Scope scope, Operand<TString> handle, Operand<TInt64> localStep, Operand<TInt64> gradientIndices, Operand<? extends TType> gradientValues, Operand<TInt64> gradientShape, Boolean hasKnownShape) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseAccumulatorApplyGradient", scope.makeOpName("SparseAccumulatorApplyGradient"));
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(localStep.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java
index 9153c575162..7ced04729a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java
@@ -66,7 +66,7 @@ public final class SparseAdd<T extends TType> extends RawOp {
    * @return a new instance of SparseAdd
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseAdd<T> create(Scope scope, Operand<TInt64> aIndices, Operand<T> aValues, Operand<TInt64> aShape, Operand<TInt64> bIndices, Operand<T> bValues, Operand<TInt64> bShape, Operand<U> thresh) {
+  public static <T extends TType> SparseAdd<T> create(Scope scope, Operand<TInt64> aIndices, Operand<T> aValues, Operand<TInt64> aShape, Operand<TInt64> bIndices, Operand<T> bValues, Operand<TInt64> bShape, Operand<? extends TNumber> thresh) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseAdd", scope.makeOpName("SparseAdd"));
     opBuilder.addInput(aIndices.asOutput());
     opBuilder.addInput(aValues.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java
index 85e6707f0c0..3133f02292a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java
@@ -79,7 +79,7 @@ private Options() {
    * @return a new instance of SparseCountSparseOutput
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TNumber, T extends TNumber> SparseCountSparseOutput<U> create(Scope scope, Operand<TInt64> indices, Operand<T> values, Operand<TInt64> denseShape, Operand<U> weights, Boolean binaryOutput, Options... options) {
+  public static <U extends TNumber> SparseCountSparseOutput<U> create(Scope scope, Operand<TInt64> indices, Operand<? extends TNumber> values, Operand<TInt64> denseShape, Operand<U> weights, Boolean binaryOutput, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseCountSparseOutput", scope.makeOpName("SparseCountSparseOutput"));
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java
index d254cb3224c..ce1216ea5e1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java
@@ -100,7 +100,7 @@ private Options() {
    * @return a new instance of SparseMatMul
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> SparseMatMul create(Scope scope, Operand<T> a, Operand<U> b, Options... options) {
+  public static SparseMatMul create(Scope scope, Operand<? extends TNumber> a, Operand<? extends TNumber> b, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseMatMul", scope.makeOpName("SparseMatMul"));
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java
index a373bd33f03..496dfc994de 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java
@@ -50,7 +50,7 @@ public final class SparseSegmentMean<T extends TNumber> extends RawOp implements
    * @return a new instance of SparseSegmentMean
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentMean<T> create(Scope scope, Operand<T> data, Operand<U> indices, Operand<V> segmentIds) {
+  public static <T extends TNumber> SparseSegmentMean<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMean", scope.makeOpName("SparseSegmentMean"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java
index 8e558afbe9e..2b9aa410096 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java
@@ -50,7 +50,7 @@ public final class SparseSegmentMeanGrad<T extends TNumber> extends RawOp implem
    * @return a new instance of SparseSegmentMeanGrad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentMeanGrad<T> create(Scope scope, Operand<T> grad, Operand<U> indices, Operand<V> segmentIds, Operand<TInt32> outputDim0) {
+  public static <T extends TNumber> SparseSegmentMeanGrad<T> create(Scope scope, Operand<T> grad, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds, Operand<TInt32> outputDim0) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMeanGrad", scope.makeOpName("SparseSegmentMeanGrad"));
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java
index d62b956b096..e2d79025981 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java
@@ -53,7 +53,7 @@ public final class SparseSegmentMeanWithNumSegments<T extends TNumber> extends R
    * @return a new instance of SparseSegmentMeanWithNumSegments
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber, W extends TNumber> SparseSegmentMeanWithNumSegments<T> create(Scope scope, Operand<T> data, Operand<U> indices, Operand<V> segmentIds, Operand<W> numSegments) {
+  public static <T extends TNumber> SparseSegmentMeanWithNumSegments<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMeanWithNumSegments", scope.makeOpName("SparseSegmentMeanWithNumSegments"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java
index 50fe5cc8068..f9768aa67bd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java
@@ -50,7 +50,7 @@ public final class SparseSegmentSqrtN<T extends TNumber> extends RawOp implement
    * @return a new instance of SparseSegmentSqrtN
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSqrtN<T> create(Scope scope, Operand<T> data, Operand<U> indices, Operand<V> segmentIds) {
+  public static <T extends TNumber> SparseSegmentSqrtN<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtN", scope.makeOpName("SparseSegmentSqrtN"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java
index 9faa31633c0..8d43bc92976 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java
@@ -50,7 +50,7 @@ public final class SparseSegmentSqrtNGrad<T extends TNumber> extends RawOp imple
    * @return a new instance of SparseSegmentSqrtNGrad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSqrtNGrad<T> create(Scope scope, Operand<T> grad, Operand<U> indices, Operand<V> segmentIds, Operand<TInt32> outputDim0) {
+  public static <T extends TNumber> SparseSegmentSqrtNGrad<T> create(Scope scope, Operand<T> grad, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds, Operand<TInt32> outputDim0) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtNGrad", scope.makeOpName("SparseSegmentSqrtNGrad"));
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java
index f962af5be0f..569c2d40534 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java
@@ -55,7 +55,7 @@ public final class SparseSegmentSqrtNWithNumSegments<T extends TNumber> extends
    * @return a new instance of SparseSegmentSqrtNWithNumSegments
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber, W extends TNumber> SparseSegmentSqrtNWithNumSegments<T> create(Scope scope, Operand<T> data, Operand<U> indices, Operand<V> segmentIds, Operand<W> numSegments) {
+  public static <T extends TNumber> SparseSegmentSqrtNWithNumSegments<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtNWithNumSegments", scope.makeOpName("SparseSegmentSqrtNWithNumSegments"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java
index add00c19798..04e00d71648 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java
@@ -75,7 +75,7 @@ public final class SparseSegmentSum<T extends TNumber> extends RawOp implements
    * @return a new instance of SparseSegmentSum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber> SparseSegmentSum<T> create(Scope scope, Operand<T> data, Operand<U> indices, Operand<V> segmentIds) {
+  public static <T extends TNumber> SparseSegmentSum<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSum", scope.makeOpName("SparseSegmentSum"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java
index b956d005069..0dca626c528 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java
@@ -74,7 +74,7 @@ public final class SparseSegmentSumWithNumSegments<T extends TNumber> extends Ra
    * @return a new instance of SparseSegmentSumWithNumSegments
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber, V extends TNumber, W extends TNumber> SparseSegmentSumWithNumSegments<T> create(Scope scope, Operand<T> data, Operand<U> indices, Operand<V> segmentIds, Operand<W> numSegments) {
+  public static <T extends TNumber> SparseSegmentSumWithNumSegments<T> create(Scope scope, Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSumWithNumSegments", scope.makeOpName("SparseSegmentSumWithNumSegments"));
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java
index cadce484f8f..076dd63a78d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java
@@ -89,7 +89,7 @@ private Options() {
    * @return a new instance of SparseTensorDenseMatMul
    */
   @Endpoint(describeByClass = true)
-  public static <U extends TType, T extends TNumber> SparseTensorDenseMatMul<U> create(Scope scope, Operand<T> aIndices, Operand<U> aValues, Operand<TInt64> aShape, Operand<U> b, Options... options) {
+  public static <U extends TType> SparseTensorDenseMatMul<U> create(Scope scope, Operand<? extends TNumber> aIndices, Operand<U> aValues, Operand<TInt64> aShape, Operand<U> b, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorDenseMatMul", scope.makeOpName("SparseTensorDenseMatMul"));
     opBuilder.addInput(aIndices.asOutput());
     opBuilder.addInput(aValues.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java
index d24d09a67ef..091d598a2e8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java
@@ -101,7 +101,7 @@ private Options() {
    * @return a new instance of UnicodeEncode
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> UnicodeEncode create(Scope scope, Operand<TInt32> inputValues, Operand<T> inputSplits, String outputEncoding, Options... options) {
+  public static UnicodeEncode create(Scope scope, Operand<TInt32> inputValues, Operand<? extends TNumber> inputSplits, String outputEncoding, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("UnicodeEncode", scope.makeOpName("UnicodeEncode"));
     opBuilder.addInput(inputValues.asOutput());
     opBuilder.addInput(inputSplits.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java
index 075d21d219e..790196f34e3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java
@@ -92,7 +92,7 @@ private Options() {
    * @return a new instance of UnsortedSegmentJoin
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber, U extends TNumber> UnsortedSegmentJoin create(Scope scope, Operand<TString> inputs, Operand<T> segmentIds, Operand<U> numSegments, Options... options) {
+  public static UnsortedSegmentJoin create(Scope scope, Operand<TString> inputs, Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentJoin", scope.makeOpName("UnsortedSegmentJoin"));
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java
index 0acfec7cac1..34ed418e986 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java
@@ -49,7 +49,7 @@ public final class HistogramSummary extends RawOp implements Operand<TString> {
    * @return a new instance of HistogramSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> HistogramSummary create(Scope scope, Operand<TString> tag, Operand<T> values) {
+  public static HistogramSummary create(Scope scope, Operand<TString> tag, Operand<? extends TNumber> values) {
     OperationBuilder opBuilder = scope.env().opBuilder("HistogramSummary", scope.makeOpName("HistogramSummary"));
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(values.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java
index 7217055142b..c5c4a9b30a7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java
@@ -121,7 +121,7 @@ private Options() {
    * @return a new instance of ImageSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> ImageSummary create(Scope scope, Operand<TString> tag, Operand<T> tensor, Options... options) {
+  public static ImageSummary create(Scope scope, Operand<TString> tag, Operand<? extends TNumber> tensor, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ImageSummary", scope.makeOpName("ImageSummary"));
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(tensor.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java
index 37740dc7ef3..27989bc1fed 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java
@@ -46,7 +46,7 @@ public final class ScalarSummary extends RawOp implements Operand<TString> {
    * @return a new instance of ScalarSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> ScalarSummary create(Scope scope, Operand<TString> tags, Operand<T> values) {
+  public static ScalarSummary create(Scope scope, Operand<TString> tags, Operand<? extends TNumber> values) {
     OperationBuilder opBuilder = scope.env().opBuilder("ScalarSummary", scope.makeOpName("ScalarSummary"));
     opBuilder.addInput(tags.asOutput());
     opBuilder.addInput(values.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java
index 4b0d0fb1c4d..be4ceff4fb4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java
@@ -45,7 +45,7 @@ public final class TensorSummary extends RawOp implements Operand<TString> {
    * @return a new instance of TensorSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> TensorSummary create(Scope scope, Operand<TString> tag, Operand<T> tensor, Operand<TString> serializedSummaryMetadata) {
+  public static TensorSummary create(Scope scope, Operand<TString> tag, Operand<? extends TType> tensor, Operand<TString> serializedSummaryMetadata) {
     OperationBuilder opBuilder = scope.env().opBuilder("TensorSummaryV2", scope.makeOpName("TensorSummary"));
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(tensor.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java
index 7daeb5ccbd0..11b2b4e942d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java
@@ -43,7 +43,7 @@ public final class WriteHistogramSummary extends RawOp {
    * @return a new instance of WriteHistogramSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> WriteHistogramSummary create(Scope scope, Operand<?> writer, Operand<TInt64> step, Operand<TString> tag, Operand<T> values) {
+  public static WriteHistogramSummary create(Scope scope, Operand<?> writer, Operand<TInt64> step, Operand<TString> tag, Operand<? extends TNumber> values) {
     OperationBuilder opBuilder = scope.env().opBuilder("WriteHistogramSummary", scope.makeOpName("WriteHistogramSummary"));
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java
index 70eed3c13a1..51436c8e07e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java
@@ -65,7 +65,7 @@ private Options() {
    * @return a new instance of WriteImageSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> WriteImageSummary create(Scope scope, Operand<?> writer, Operand<TInt64> step, Operand<TString> tag, Operand<T> tensor, Operand<TUint8> badColor, Options... options) {
+  public static WriteImageSummary create(Scope scope, Operand<?> writer, Operand<TInt64> step, Operand<TString> tag, Operand<? extends TNumber> tensor, Operand<TUint8> badColor, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("WriteImageSummary", scope.makeOpName("WriteImageSummary"));
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java
index ce5a91db59b..9f68f48e4bb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java
@@ -43,7 +43,7 @@ public final class WriteScalarSummary extends RawOp {
    * @return a new instance of WriteScalarSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TNumber> WriteScalarSummary create(Scope scope, Operand<?> writer, Operand<TInt64> step, Operand<TString> tag, Operand<T> value) {
+  public static WriteScalarSummary create(Scope scope, Operand<?> writer, Operand<TInt64> step, Operand<TString> tag, Operand<? extends TNumber> value) {
     OperationBuilder opBuilder = scope.env().opBuilder("WriteScalarSummary", scope.makeOpName("WriteScalarSummary"));
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java
index 9555f1add0b..a27ceff133e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java
@@ -44,7 +44,7 @@ public final class WriteSummary extends RawOp {
    * @return a new instance of WriteSummary
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> WriteSummary create(Scope scope, Operand<?> writer, Operand<TInt64> step, Operand<T> tensor, Operand<TString> tag, Operand<TString> summaryMetadata) {
+  public static WriteSummary create(Scope scope, Operand<?> writer, Operand<TInt64> step, Operand<? extends TType> tensor, Operand<TString> tag, Operand<TString> summaryMetadata) {
     OperationBuilder opBuilder = scope.env().opBuilder("WriteSummary", scope.makeOpName("WriteSummary"));
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java
index f0a9ee049b3..f5964ccbde5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java
@@ -83,7 +83,7 @@ private Options() {
    * @return a new instance of InfeedEnqueue
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> InfeedEnqueue create(Scope scope, Operand<T> input, Options... options) {
+  public static InfeedEnqueue create(Scope scope, Operand<? extends TType> input, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("InfeedEnqueue", scope.makeOpName("InfeedEnqueue"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java
index f7c3c08f967..27b13bcae61 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java
@@ -39,7 +39,7 @@ public final class OutfeedEnqueue extends RawOp {
    * @return a new instance of OutfeedEnqueue
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> OutfeedEnqueue create(Scope scope, Operand<T> input) {
+  public static OutfeedEnqueue create(Scope scope, Operand<? extends TType> input) {
     OperationBuilder opBuilder = scope.env().opBuilder("OutfeedEnqueue", scope.makeOpName("OutfeedEnqueue"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java
index 6e3e451c61f..5cce51a5bf2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java
@@ -73,7 +73,7 @@ private Options() {
    * @return a new instance of Prelinearize
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Prelinearize create(Scope scope, Operand<T> input, Options... options) {
+  public static Prelinearize create(Scope scope, Operand<? extends TType> input, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("Prelinearize", scope.makeOpName("Prelinearize"));
     opBuilder.addInput(input.asOutput());
     opBuilder = scope.apply(opBuilder);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java
index 925916e8954..ee5fe7db4b5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java
@@ -46,7 +46,7 @@ public final class AccumulatorApplyGradient extends RawOp {
    * @return a new instance of AccumulatorApplyGradient
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> AccumulatorApplyGradient create(Scope scope, Operand<TString> handle, Operand<TInt64> localStep, Operand<T> gradient) {
+  public static AccumulatorApplyGradient create(Scope scope, Operand<TString> handle, Operand<TInt64> localStep, Operand<? extends TType> gradient) {
     OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorApplyGradient", scope.makeOpName("AccumulatorApplyGradient"));
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(localStep.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java
index 363a80b95a9..373d5efe501 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java
@@ -44,7 +44,7 @@ public final class ResourceAccumulatorApplyGradient extends RawOp {
    * @return a new instance of ResourceAccumulatorApplyGradient
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> ResourceAccumulatorApplyGradient create(Scope scope, Operand<?> handle, Operand<TInt64> localStep, Operand<T> gradient) {
+  public static ResourceAccumulatorApplyGradient create(Scope scope, Operand<?> handle, Operand<TInt64> localStep, Operand<? extends TType> gradient) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorApplyGradient", scope.makeOpName("ResourceAccumulatorApplyGradient"));
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(localStep.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java
index 018921b0a5e..29a2a993245 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java
@@ -69,7 +69,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyAdadelta
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyAdadelta create(Scope scope, Operand<?> var, Operand<?> accum, Operand<?> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> ResourceSparseApplyAdadelta create(Scope scope, Operand<?> var, Operand<?> accum, Operand<?> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyAdadelta", scope.makeOpName("ResourceSparseApplyAdadelta"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java
index 3376b099eba..ac0fd69675e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java
@@ -80,7 +80,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyAdagrad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyAdagrad create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> ResourceSparseApplyAdagrad create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyAdagrad", scope.makeOpName("ResourceSparseApplyAdagrad"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java
index 467f96c0b0f..cf3c20f69d6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyAdagradDa
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyAdagradDa create(Scope scope, Operand<?> var, Operand<?> gradientAccumulator, Operand<?> gradientSquaredAccumulator, Operand<T> grad, Operand<U> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<TInt64> globalStep, Options... options) {
+  public static <T extends TType> ResourceSparseApplyAdagradDa create(Scope scope, Operand<?> var, Operand<?> gradientAccumulator, Operand<?> gradientSquaredAccumulator, Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<TInt64> globalStep, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyAdagradDA", scope.makeOpName("ResourceSparseApplyAdagradDa"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(gradientAccumulator.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java
index a4d61d2cdf6..0cd880c76d8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java
@@ -80,7 +80,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyAdagradV2
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyAdagradV2 create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> epsilon, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> ResourceSparseApplyAdagradV2 create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyAdagradV2", scope.makeOpName("ResourceSparseApplyAdagradV2"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java
index d94e88f06dc..aa0cdb54cb5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java
@@ -89,7 +89,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyCenteredRmsProp
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyCenteredRmsProp create(Scope scope, Operand<?> var, Operand<?> mg, Operand<?> ms, Operand<?> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> ResourceSparseApplyCenteredRmsProp create(Scope scope, Operand<?> var, Operand<?> mg, Operand<?> ms, Operand<?> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyCenteredRMSProp", scope.makeOpName("ResourceSparseApplyCenteredRmsProp"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(mg.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java
index 2e302d18037..802a1d86d5e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java
@@ -90,7 +90,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyFtrl
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyFtrl create(Scope scope, Operand<?> var, Operand<?> accum, Operand<?> linear, Operand<T> grad, Operand<U> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> l2Shrinkage, Operand<T> lrPower, Options... options) {
+  public static <T extends TType> ResourceSparseApplyFtrl create(Scope scope, Operand<?> var, Operand<?> accum, Operand<?> linear, Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> l2Shrinkage, Operand<T> lrPower, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyFtrlV2", scope.makeOpName("ResourceSparseApplyFtrl"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java
index 7a914ea54d4..e0a6eac37e3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java
@@ -86,7 +86,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyKerasMomentum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyKerasMomentum create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<U> indices, Operand<T> momentum, Options... options) {
+  public static <T extends TType> ResourceSparseApplyKerasMomentum create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> momentum, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyKerasMomentum", scope.makeOpName("ResourceSparseApplyKerasMomentum"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java
index 2ee7d166cbe..60ca59ace25 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java
@@ -86,7 +86,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyMomentum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyMomentum create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<U> indices, Operand<T> momentum, Options... options) {
+  public static <T extends TType> ResourceSparseApplyMomentum create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> momentum, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyMomentum", scope.makeOpName("ResourceSparseApplyMomentum"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java
index afb578d6519..9fff6b866ff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java
@@ -74,7 +74,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyProximalAdagrad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyProximalAdagrad create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> ResourceSparseApplyProximalAdagrad create(Scope scope, Operand<?> var, Operand<?> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyProximalAdagrad", scope.makeOpName("ResourceSparseApplyProximalAdagrad"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java
index 840290696ff..bb6cab1e2d3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java
@@ -71,7 +71,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyProximalGradientDescent
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyProximalGradientDescent create(Scope scope, Operand<?> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> ResourceSparseApplyProximalGradientDescent create(Scope scope, Operand<?> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyProximalGradientDescent", scope.makeOpName("ResourceSparseApplyProximalGradientDescent"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(alpha.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java
index 233b0db5f2b..05581cb35c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java
@@ -82,7 +82,7 @@ private Options() {
    * @return a new instance of ResourceSparseApplyRmsProp
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> ResourceSparseApplyRmsProp create(Scope scope, Operand<?> var, Operand<?> ms, Operand<?> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> ResourceSparseApplyRmsProp create(Scope scope, Operand<?> var, Operand<?> ms, Operand<?> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyRMSProp", scope.makeOpName("ResourceSparseApplyRmsProp"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(ms.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java
index 4a0ad5e6a4f..174f3bfecd4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java
@@ -72,7 +72,7 @@ private Options() {
    * @return a new instance of SparseApplyAdadelta
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyAdadelta<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> SparseApplyAdadelta<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyAdadelta", scope.makeOpName("SparseApplyAdadelta"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java
index 7c925080bc1..8df06b5e426 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java
@@ -83,7 +83,7 @@ private Options() {
    * @return a new instance of SparseApplyAdagrad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyAdagrad<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> lr, Operand<T> epsilon, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> SparseApplyAdagrad<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> lr, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyAdagradV2", scope.makeOpName("SparseApplyAdagrad"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java
index 971525a877b..2e8aede1551 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java
@@ -74,7 +74,7 @@ private Options() {
    * @return a new instance of SparseApplyAdagradDa
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyAdagradDa<T> create(Scope scope, Operand<T> var, Operand<T> gradientAccumulator, Operand<T> gradientSquaredAccumulator, Operand<T> grad, Operand<U> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<TInt64> globalStep, Options... options) {
+  public static <T extends TType> SparseApplyAdagradDa<T> create(Scope scope, Operand<T> var, Operand<T> gradientAccumulator, Operand<T> gradientSquaredAccumulator, Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<TInt64> globalStep, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyAdagradDA", scope.makeOpName("SparseApplyAdagradDa"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(gradientAccumulator.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java
index 6d7e47cb235..88ea8cf91f3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java
@@ -92,7 +92,7 @@ private Options() {
    * @return a new instance of SparseApplyCenteredRmsProp
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyCenteredRmsProp<T> create(Scope scope, Operand<T> var, Operand<T> mg, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> SparseApplyCenteredRmsProp<T> create(Scope scope, Operand<T> var, Operand<T> mg, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyCenteredRMSProp", scope.makeOpName("SparseApplyCenteredRmsProp"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(mg.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java
index f5add81d0fe..f720183d7e7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java
@@ -93,7 +93,7 @@ private Options() {
    * @return a new instance of SparseApplyFtrl
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyFtrl<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> linear, Operand<T> grad, Operand<U> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> l2Shrinkage, Operand<T> lrPower, Options... options) {
+  public static <T extends TType> SparseApplyFtrl<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> linear, Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> l2Shrinkage, Operand<T> lrPower, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyFtrlV2", scope.makeOpName("SparseApplyFtrl"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java
index bb0417ad8d4..577ea1ac28b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java
@@ -89,7 +89,7 @@ private Options() {
    * @return a new instance of SparseApplyMomentum
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyMomentum<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> lr, Operand<T> grad, Operand<U> indices, Operand<T> momentum, Options... options) {
+  public static <T extends TType> SparseApplyMomentum<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> lr, Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> momentum, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyMomentum", scope.makeOpName("SparseApplyMomentum"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java
index 780fe1e4b84..f38f42737ef 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java
@@ -77,7 +77,7 @@ private Options() {
    * @return a new instance of SparseApplyProximalAdagrad
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyProximalAdagrad<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> SparseApplyProximalAdagrad<T> create(Scope scope, Operand<T> var, Operand<T> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyProximalAdagrad", scope.makeOpName("SparseApplyProximalAdagrad"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java
index e9c62c888d5..169b8d4f0c2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java
@@ -74,7 +74,7 @@ private Options() {
    * @return a new instance of SparseApplyProximalGradientDescent
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyProximalGradientDescent<T> create(Scope scope, Operand<T> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> SparseApplyProximalGradientDescent<T> create(Scope scope, Operand<T> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyProximalGradientDescent", scope.makeOpName("SparseApplyProximalGradientDescent"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(alpha.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java
index 19a36d1a1fb..6de8f3be05d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java
@@ -85,7 +85,7 @@ private Options() {
    * @return a new instance of SparseApplyRmsProp
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> SparseApplyRmsProp<T> create(Scope scope, Operand<T> var, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<U> indices, Options... options) {
+  public static <T extends TType> SparseApplyRmsProp<T> create(Scope scope, Operand<T> var, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
     OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyRMSProp", scope.makeOpName("SparseApplyRmsProp"));
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(ms.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java
index 0bb729b45ae..0813440fa03 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java
@@ -50,7 +50,7 @@ public final class BroadcastHelper<T extends TType> extends RawOp {
    * @return a new instance of BroadcastHelper
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> BroadcastHelper<T> create(Scope scope, Operand<T> lhs, Operand<T> rhs, Operand<U> broadcastDims) {
+  public static <T extends TType> BroadcastHelper<T> create(Scope scope, Operand<T> lhs, Operand<T> rhs, Operand<? extends TNumber> broadcastDims) {
     OperationBuilder opBuilder = scope.env().opBuilder("XlaBroadcastHelper", scope.makeOpName("BroadcastHelper"));
     opBuilder.addInput(lhs.asOutput());
     opBuilder.addInput(rhs.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java
index adcc4a1ec69..32653d46869 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java
@@ -57,7 +57,7 @@ public final class DynamicUpdateSlice<T extends TType> extends RawOp implements
    * @return a new instance of DynamicUpdateSlice
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType, U extends TNumber> DynamicUpdateSlice<T> create(Scope scope, Operand<T> input, Operand<T> update, Operand<U> indices) {
+  public static <T extends TType> DynamicUpdateSlice<T> create(Scope scope, Operand<T> input, Operand<T> update, Operand<? extends TNumber> indices) {
     OperationBuilder opBuilder = scope.env().opBuilder("XlaDynamicUpdateSlice", scope.makeOpName("DynamicUpdateSlice"));
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(update.asOutput());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java
index f1806a79b10..948cdee567f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java
@@ -44,7 +44,7 @@ public final class Send extends RawOp {
    * @return a new instance of Send
    */
   @Endpoint(describeByClass = true)
-  public static <T extends TType> Send create(Scope scope, Operand<T> tensor, String tensorName) {
+  public static Send create(Scope scope, Operand<? extends TType> tensor, String tensorName) {
     OperationBuilder opBuilder = scope.env().opBuilder("XlaSend", scope.makeOpName("Send"));
     opBuilder.addInput(tensor.asOutput());
     opBuilder = scope.apply(opBuilder);