diff --git a/README.md b/README.md index 67dae4fc1ab..536ce3f27ba 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,7 @@ This table shows the mapping between TensorFlow, TensorFlow Java and minimum sup | 1.0.0-rc.2 | 2.16.2 | 11 | | 1.0.0 | 2.16.2 | 11 | | 1.1.0 | 2.18.0 | 11 | -| 1.2.0-SNAPSHOT | 2.20.0 | 11 | +| 1.2.0-SNAPSHOT | 2.21.0 | 11 | ## How to Contribute? diff --git a/tensorflow-core/pom.xml b/tensorflow-core/pom.xml index 03c548a4111..cc87f6a76bc 100644 --- a/tensorflow-core/pom.xml +++ b/tensorflow-core/pom.xml @@ -42,7 +42,7 @@ https://github.com/tensorflow/tensorflow/blob/master/tensorflow/workspace2.bzl (but for the currently used release, not master) --> - 4.28.3 + 4.31.1 ${javacpp.platform}${javacpp.platform.extension} diff --git a/tensorflow-core/tensorflow-core-api/scripts/test_download.sh b/tensorflow-core/tensorflow-core-api/scripts/test_download.sh index 509468bade2..22666bb2b80 100755 --- a/tensorflow-core/tensorflow-core-api/scripts/test_download.sh +++ b/tensorflow-core/tensorflow-core-api/scripts/test_download.sh @@ -5,13 +5,13 @@ DOWNLOAD_FOLDER="$1" case ${PLATFORM:-} in 'linux-x86_64') - TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/c3/e6/cfd784298ffb759a4235721cac2ac20f7ff758bf687069cfbaebb06c5804/tensorflow_text-2.20.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl' + TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/a9/b9/02707723d44e5d0fe5f7d27ba4237528bc654bac1b0f638efe37988584b1/tensorflow_text-2.20.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl' ;; 'linux-arm64') - TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/f5/ca/796cfd97ae6693d3c84c37575a6d481be5f1ef36c920d1a73c884f31797b/tensorflow_text-2.20.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl' + TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/17/99/b397038628a660a1446bb79c8be284443a28500d072227a77ebaeb5cd149/tensorflow_text-2.20.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl' ;; 'macosx-arm64') - TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/98/e4/e3c72d0a73caeba90cf5b31e69d44e9a08d614e0e829484d813f3b63e037/tensorflow_text-2.20.0-cp312-cp312-macosx_11_0_arm64.whl' + TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/61/b8/ccb0c3b048f268860f4c92f6bb7ab55c6af6c2fe4e26746c8dc384063915/tensorflow_text-2.20.1-cp313-cp313-macosx_11_0_arm64.whl' ;; *) echo "TensorFlow Text distribution for ${PLATFORM} is not supported for download" diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataExperimentalOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataExperimentalOps.java index 4fa8e60e295..b5b1ee3750f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataExperimentalOps.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataExperimentalOps.java @@ -694,7 +694,6 @@ public ThreadPoolDataset threadPoolDataset(Operand inputDataset * @param numThreads The number of threads in the thread pool. * @param displayName A human-readable name for the threads that may be visible in some * visualizations. - * threadpool. * @param options carries optional attribute values * @return a new instance of ThreadPoolHandle */ diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataOps.java index 5a3a14b799e..0f8695568db 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataOps.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataOps.java @@ -2197,7 +2197,6 @@ public ThreadPoolDataset threadPoolDataset(Operand inputDataset * @param numThreads The number of threads in the thread pool. * @param displayName A human-readable name for the threads that may be visible in some * visualizations. - * threadpool. * @param options carries optional attribute values * @return a new instance of ThreadPoolHandle */ 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 896bb62de5c..471e1435cb6 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 @@ -337,10 +337,10 @@ public DecodeGif decodeGif(Operand contents) { } /** - * Function for decode_bmp, decode_gif, decode_jpeg, decode_webp, and decode_png. - * Detects whether an image is a BMP, GIF, JPEG, WebP, or PNG, and performs the - * appropriate operation to convert the input bytes string into a Tensor of type - * dtype. + * Function for decode_bmp, decode_gif, decode_jpeg, decode_jxl, decode_webp, and decode_png. + * Detects whether an image is a BMP, GIF, JPEG, JPEG XL, WebP, or PNG, and + * performs the appropriate operation to convert the input bytes string into a + * Tensor of type dtype. *

NOTE: decode_gif and decode_webp return a 4-D * array [num_frames, height, width, 3], as opposed to decode_bmp, * decode_jpeg, and decode_png, which always return 3-D arrays [height, @@ -365,10 +365,10 @@ public DecodeImage decodeImage(Operand contents, } /** - * Function for decode_bmp, decode_gif, decode_jpeg, decode_webp, and decode_png. - * Detects whether an image is a BMP, GIF, JPEG, WebP, or PNG, and performs the - * appropriate operation to convert the input bytes string into a Tensor of type - * dtype. + * Function for decode_bmp, decode_gif, decode_jpeg, decode_jxl, decode_webp, and decode_png. + * Detects whether an image is a BMP, GIF, JPEG, JPEG XL, WebP, or PNG, and + * performs the appropriate operation to convert the input bytes string into a + * Tensor of type dtype. *

NOTE: decode_gif and decode_webp return a 4-D * array [num_frames, height, width, 3], as opposed to decode_bmp, * decode_jpeg, and decode_png, which always return 3-D arrays [height, 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 d3dcfc686ad..9b67c49c2d4 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 @@ -668,7 +668,8 @@ public ComplexAbs complexAbs(Operand x) { * * * @param x The x value - * @param Tout The value of the Tout attribute + * @param Tout Need to be {@code tf.float32} when the type of {@code x} is {@code tf.complex64}. + * Need to be {@code tf.float64} when the type of {@code x} is {@code tf.complex128}. * @param data type for {@code ComplexAbs} output and operands * @return a new instance of ComplexAbs */ @@ -850,9 +851,9 @@ public CumulativeLogsumexp cumulativeLogsumexp(Operand * * @param input 1D or 2D int {@code Tensor}. * @param sizeOutput non-negative int scalar {@code Tensor}. - * @param weights is an int32, int64, float32, or float64 {@code Tensor} with the same - * shape as {@code arr}, or a length-0 {@code Tensor}, in which case it acts as all weights - * equal to 1. + * @param weights {@code Tensor} with the same shape as {@code arr}, or a length-0 {@code Tensor}, + * in which case it acts as all weights equal to 1. + * Not supported by the GPU implementation of Bincount. * @param options carries optional attribute values * @param data type for {@code DenseBincount} output and operands * @param data type for {@code DenseBincount} output and operands @@ -1196,7 +1197,8 @@ public Imag imag(Operand input) { * * * @param input The input value - * @param Tout The value of the Tout attribute + * @param Tout Need to be {@code tf.float32} when the type of {@code x} is {@code tf.complex64}. + * Need to be {@code tf.float64} when the type of {@code x} is {@code tf.complex128}. * @param data type for {@code Imag} output and operands * @return a new instance of Imag */ 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 c9f086a3255..91b5207edfa 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 @@ -1753,7 +1753,15 @@ public IsotonicRegression isotonicRegression(OperandNote on supported input-output type combinations: + *

+ *

Using unsupported dtype pairs (for example, input=float64 with output=float32) + * will result in a "Could not find device for node" error. * @param data type for {@code IsotonicRegression} output and operands * @return a new instance of IsotonicRegression */ 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 8483a4efb61..40c5d8f1ace 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 @@ -7743,12 +7743,12 @@ public TensorListGather tensorListGather( * @param index The index value * @param elementShape The elementShape value * @param elementDtype The value of the elementDtype attribute - * @param data type for {@code TensorListGetItem} output and operands + * @param data type for {@code TensorListGetItem} output and operands * @return a new instance of TensorListGetItem */ - public TensorListGetItem tensorListGetItem( - Operand inputHandle, Operand index, Operand elementShape, - Class elementDtype) { + public TensorListGetItem tensorListGetItem( + Operand inputHandle, Operand index, + Operand elementShape, Class elementDtype) { return TensorListGetItem.create(scope, inputHandle, index, elementShape, elementDtype); } 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 88df6bf8a0e..8485f694be2 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 @@ -562,8 +562,10 @@ public QuantizeAndDequantizeV4 quantizeAndDequantizeV4(Op * * @param gradients The gradients value * @param input The input value - * @param inputMin The inputMin value - * @param inputMax The inputMax value + * @param inputMin If {@code axis} is specified, the shape of the minimum input tensor + * must be rank 1. + * @param inputMax If {@code axis} is specified, the shape of the maximum input tensor + * must be rank 1. * @param options carries optional attribute values * @param data type for {@code QuantizeAndDequantizeV4Grad} output and operands * @return a new instance of QuantizeAndDequantizeV4Grad 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 ac5703c264a..8537e79ada7 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 @@ -444,9 +444,10 @@ public IrfftNd irfftNd(Operand input, * corresponding dimension of {@code input}, the dimension is cropped. If it is larger, * the dimension is padded with zeros. * - * @param input A float32 tensor. + * @param input A float32 or float64 tensor. * @param fftLength An int32 tensor of shape [1]. The FFT length. - * @param Tcomplex The value of the Tcomplex attribute + * @param Tcomplex Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. * @param data type for {@code RFFT} output and operands * @return a new instance of Rfft */ @@ -467,9 +468,10 @@ public Rfft rfft(Operand input, Operand< * corresponding dimension of {@code input}, the dimension is cropped. If it is larger, * the dimension is padded with zeros. * - * @param input A float32 tensor. + * @param input A float32 or float64 tensor. * @param fftLength An int32 tensor of shape [2]. The FFT length for each dimension. - * @param Tcomplex The value of the Tcomplex attribute + * @param Tcomplex Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. * @param data type for {@code RFFT2D} output and operands * @return a new instance of Rfft2d */ @@ -490,9 +492,10 @@ public Rfft2d rfft2d(Operand input, * corresponding dimension of {@code input}, the dimension is cropped. If it is larger, * the dimension is padded with zeros. * - * @param input A float32 tensor. + * @param input A float32 or float64 tensor. * @param fftLength An int32 tensor of shape [3]. The FFT length for each dimension. - * @param Tcomplex The value of the Tcomplex attribute + * @param Tcomplex Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. * @param data type for {@code RFFT3D} output and operands * @return a new instance of Rfft3d */ @@ -513,10 +516,11 @@ public Rfft3d rfft3d(Operand input, *

Axes mean the dimensions to perform the transform on. Default is to perform on * all axes. * - * @param input A complex tensor. + * @param input A float32 or float64 tensor. * @param fftLength An int32 tensor. The FFT length for each dimension. * @param axes An int32 tensor with a same shape as fft_length. Axes to perform the transform. - * @param Tcomplex The value of the Tcomplex attribute + * @param Tcomplex Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. * @param data type for {@code RFFTND} output and operands * @return a new instance of RfftNd */ diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGetItem.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGetItem.java index 244704b5754..8fbdb5e80e0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGetItem.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGetItem.java @@ -33,6 +33,7 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.proto.DataType; import org.tensorflow.types.TInt32; +import org.tensorflow.types.family.TNumber; import org.tensorflow.types.family.TType; /** @@ -46,13 +47,13 @@ inputsClass = TensorListGetItem.Inputs.class ) @Operator -public final class TensorListGetItem extends RawOp implements Operand { +public final class TensorListGetItem extends RawOp implements Operand { /** * The name of this op, as known by TensorFlow core engine */ public static final String OP_NAME = "TensorListGetItem"; - private Output item; + private Output item; public TensorListGetItem(Operation operation) { super(operation, OP_NAME); @@ -68,15 +69,15 @@ public TensorListGetItem(Operation operation) { * @param index The index value * @param elementShape The elementShape value * @param elementDtype The value of the elementDtype attribute - * @param data type for {@code TensorListGetItem} output and operands + * @param data type for {@code TensorListGetItem} output and operands * @return a new instance of TensorListGetItem */ @Endpoint( describeByClass = true ) - public static TensorListGetItem create(Scope scope, - Operand inputHandle, Operand index, Operand elementShape, - Class elementDtype) { + public static TensorListGetItem create(Scope scope, + Operand inputHandle, Operand index, + Operand elementShape, Class elementDtype) { OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListGetItem"); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(index.asOutput()); @@ -90,12 +91,12 @@ public static TensorListGetItem create(Scope scope, * * @return item. */ - public Output item() { + public Output item() { return item; } @Override - public Output asOutput() { + public Output asOutput() { return item; } @@ -116,20 +117,26 @@ public static class Inputs extends RawOpInputs> { /** * The elementShape input */ - public final Operand elementShape; + public final Operand elementShape; /** * The elementDtype attribute */ public final DataType elementDtype; + /** + * The Tshape attribute + */ + public final DataType Tshape; + public Inputs(GraphOperation op) { - super(new TensorListGetItem<>(op), op, Arrays.asList("element_dtype")); + super(new TensorListGetItem<>(op), op, Arrays.asList("element_dtype", "Tshape")); int inputIndex = 0; inputHandle = (Operand) op.input(inputIndex++); index = (Operand) op.input(inputIndex++); - elementShape = (Operand) op.input(inputIndex++); + elementShape = (Operand) op.input(inputIndex++); elementDtype = op.attributes().getAttrType("element_dtype"); + Tshape = op.attributes().getAttrType("Tshape"); } } } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorHandle.java index 080585d34a6..c17850e66a4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorHandle.java @@ -85,7 +85,8 @@ public static StatsAggregatorHandle create(Scope scope, Options... options) { /** * Sets the container option. * - * @param container the container option + * @param container The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. * @return this Options instance. */ public static Options container(String container) { @@ -131,7 +132,8 @@ private Options() { /** * Sets the container option. * - * @param container the container option + * @param container The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. * @return this Options instance. */ public Options container(String container) { @@ -156,7 +158,8 @@ public Options sharedName(String sharedName) { ) public static class Inputs extends RawOpInputs { /** - * The container attribute + * The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. */ public final String container; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolHandle.java index 8e110f97a30..f372fcd859d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolHandle.java @@ -64,7 +64,6 @@ public ThreadPoolHandle(Operation operation) { * @param numThreads The number of threads in the thread pool. * @param displayName A human-readable name for the threads that may be visible in some * visualizations. - * threadpool. * @param options carries optional attribute values * @return a new instance of ThreadPoolHandle */ @@ -106,7 +105,8 @@ public static Options maxIntraOpParallelism(Long maxIntraOpParallelism) { /** * Sets the container option. * - * @param container the container option + * @param container The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. * @return this Options instance. */ public static Options container(String container) { @@ -125,8 +125,7 @@ public static Options sharedName(String sharedName) { /** * Gets handle. - * A resource that can be consumed by one or more ExperimentalThreadPoolDataset - * ops. + * * @return handle. */ public Output handle() { @@ -167,7 +166,8 @@ public Options maxIntraOpParallelism(Long maxIntraOpParallelism) { /** * Sets the container option. * - * @param container the container option + * @param container The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. * @return this Options instance. */ public Options container(String container) { @@ -205,12 +205,12 @@ public static class Inputs extends RawOpInputs { /** * A human-readable name for the threads that may be visible in some * visualizations. - * threadpool. */ public final String displayName; /** - * The container attribute + * The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. */ public final String container; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolHandle.java index edcfe5cd3b8..2022bbba44d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolHandle.java @@ -64,7 +64,6 @@ public ThreadPoolHandle(Operation operation) { * @param numThreads The number of threads in the thread pool. * @param displayName A human-readable name for the threads that may be visible in some * visualizations. - * threadpool. * @param options carries optional attribute values * @return a new instance of ThreadPoolHandle */ @@ -106,7 +105,8 @@ public static Options maxIntraOpParallelism(Long maxIntraOpParallelism) { /** * Sets the container option. * - * @param container the container option + * @param container The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. * @return this Options instance. */ public static Options container(String container) { @@ -125,8 +125,7 @@ public static Options sharedName(String sharedName) { /** * Gets handle. - * A resource that can be consumed by one or more ExperimentalThreadPoolDataset - * ops. + * * @return handle. */ public Output handle() { @@ -167,7 +166,8 @@ public Options maxIntraOpParallelism(Long maxIntraOpParallelism) { /** * Sets the container option. * - * @param container the container option + * @param container The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. * @return this Options instance. */ public Options container(String container) { @@ -205,12 +205,12 @@ public static class Inputs extends RawOpInputs { /** * A human-readable name for the threads that may be visible in some * visualizations. - * threadpool. */ public final String displayName; /** - * The container attribute + * The name of {@code container} should start with {@code '.'} or {@code letter} or {@code digit}, + * with ['-', '.', '/'] or {@code letter} or {@code digit} follows several times. */ public final String container; 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 25dfbfe50ff..463a55959d4 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 @@ -124,6 +124,7 @@ public static Options precision(Long precision) { * Sets the scientific option. * * @param scientific Use scientific notation for floating point numbers. + * Can't be specified to {@code True} when {@code shortest} is set to {@code True}. * @return this Options instance. */ public static Options scientific(Boolean scientific) { @@ -135,6 +136,7 @@ public static Options scientific(Boolean scientific) { * * @param shortest Use shortest representation (either scientific or standard) for * floating point numbers. + * Can't be specified to {@code True} when {@code scientific} is set to {@code True}. * @return this Options instance. */ public static Options shortest(Boolean shortest) { @@ -211,6 +213,7 @@ public Options precision(Long precision) { * Sets the scientific option. * * @param scientific Use scientific notation for floating point numbers. + * Can't be specified to {@code True} when {@code shortest} is set to {@code True}. * @return this Options instance. */ public Options scientific(Boolean scientific) { @@ -223,6 +226,7 @@ public Options scientific(Boolean scientific) { * * @param shortest Use shortest representation (either scientific or standard) for * floating point numbers. + * Can't be specified to {@code True} when {@code scientific} is set to {@code True}. * @return this Options instance. */ public Options shortest(Boolean shortest) { @@ -278,12 +282,14 @@ public static class Inputs extends RawOpInputs { /** * Use scientific notation for floating point numbers. + * Can't be specified to {@code True} when {@code shortest} is set to {@code True}. */ public final boolean scientific; /** * Use shortest representation (either scientific or standard) for * floating point numbers. + * Can't be specified to {@code True} when {@code scientific} is set to {@code True}. */ public final boolean shortest; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeImage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeImage.java index 891c31bb514..ced9e2198c5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeImage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeImage.java @@ -37,10 +37,10 @@ import org.tensorflow.types.family.TNumber; /** - * Function for decode_bmp, decode_gif, decode_jpeg, decode_webp, and decode_png. - * Detects whether an image is a BMP, GIF, JPEG, WebP, or PNG, and performs the - * appropriate operation to convert the input bytes string into a Tensor of type - * dtype. + * Function for decode_bmp, decode_gif, decode_jpeg, decode_jxl, decode_webp, and decode_png. + * Detects whether an image is a BMP, GIF, JPEG, JPEG XL, WebP, or PNG, and + * performs the appropriate operation to convert the input bytes string into a + * Tensor of type dtype. *

NOTE: decode_gif and decode_webp return a 4-D * array [num_frames, height, width, 3], as opposed to decode_bmp, * decode_jpeg, and decode_png, which always return 3-D arrays [height, @@ -137,8 +137,8 @@ public static Options channels(Long channels) { * Sets the expandAnimations option. * * @param expandAnimations Controls the output shape of the returned op. If True, the returned op - * will produce a 3-D tensor for PNG, JPEG, and BMP files; and a 4-D - * tensor for all GIFs and WebP images, whether animated or not. If, + * will produce a 3-D tensor for PNG, JPEG, JPEG XL, and BMP files; and a + * 4-D tensor for all GIFs and WebP images, whether animated or not. If, * False, the returned op will produce a 3-D tensor for all file types * and will truncate animated images to the first frame. * @return this Options instance. @@ -188,8 +188,8 @@ public Options channels(Long channels) { * Sets the expandAnimations option. * * @param expandAnimations Controls the output shape of the returned op. If True, the returned op - * will produce a 3-D tensor for PNG, JPEG, and BMP files; and a 4-D - * tensor for all GIFs and WebP images, whether animated or not. If, + * will produce a 3-D tensor for PNG, JPEG, JPEG XL, and BMP files; and a + * 4-D tensor for all GIFs and WebP images, whether animated or not. If, * False, the returned op will produce a 3-D tensor for all file types * and will truncate animated images to the first frame. * @return this Options instance. @@ -221,8 +221,8 @@ public static class Inputs extends RawOpInputs> { /** * Controls the output shape of the returned op. If True, the returned op - * will produce a 3-D tensor for PNG, JPEG, and BMP files; and a 4-D - * tensor for all GIFs and WebP images, whether animated or not. If, + * will produce a 3-D tensor for PNG, JPEG, JPEG XL, and BMP files; and a + * 4-D tensor for all GIFs and WebP images, whether animated or not. If, * False, the returned op will produce a 3-D tensor for all file types * and will truncate animated images to the first frame. */ diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractGlimpse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractGlimpse.java index 44daff67647..ee9c2316946 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractGlimpse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractGlimpse.java @@ -145,6 +145,7 @@ public static Options normalized(Boolean normalized) { * * @param uniformNoise indicates if the noise should be generated using a * uniform distribution or a Gaussian distribution. + * It should not be {@code True} when {@code noise} is not {@code uniform}. * @return this Options instance. */ public static Options uniformNoise(Boolean uniformNoise) { @@ -222,6 +223,7 @@ public Options normalized(Boolean normalized) { * * @param uniformNoise indicates if the noise should be generated using a * uniform distribution or a Gaussian distribution. + * It should not be {@code True} when {@code noise} is not {@code uniform}. * @return this Options instance. */ public Options uniformNoise(Boolean uniformNoise) { @@ -281,6 +283,7 @@ public static class Inputs extends RawOpInputs { /** * indicates if the noise should be generated using a * uniform distribution or a Gaussian distribution. + * It should not be {@code True} when {@code noise} is not {@code uniform}. */ public final boolean uniformNoise; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCsv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCsv.java index 899877be0c6..a6c00ac6e3c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCsv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCsv.java @@ -145,7 +145,9 @@ public static Options naValue(String naValue) { /** * Sets the selectCols option. * - * @param selectCols the selectCols option + * @param selectCols Optional sorted list of column indices to select. If specified, + * only this subset of columns will be parsed and returned. + * It only works on {@code records} except for {@code record_defaults}. * @return this Options instance. */ public static Options selectCols(List selectCols) { @@ -155,7 +157,9 @@ public static Options selectCols(List selectCols) { /** * Sets the selectCols option. * - * @param selectCols the selectCols option + * @param selectCols Optional sorted list of column indices to select. If specified, + * only this subset of columns will be parsed and returned. + * It only works on {@code records} except for {@code record_defaults}. * @return this Options instance. */ public static Options selectCols(Long... selectCols) { @@ -230,7 +234,9 @@ public Options naValue(String naValue) { /** * Sets the selectCols option. * - * @param selectCols the selectCols option + * @param selectCols Optional sorted list of column indices to select. If specified, + * only this subset of columns will be parsed and returned. + * It only works on {@code records} except for {@code record_defaults}. * @return this Options instance. */ public Options selectCols(List selectCols) { @@ -241,7 +247,9 @@ public Options selectCols(List selectCols) { /** * Sets the selectCols option. * - * @param selectCols the selectCols option + * @param selectCols Optional sorted list of column indices to select. If specified, + * only this subset of columns will be parsed and returned. + * It only works on {@code records} except for {@code record_defaults}. * @return this Options instance. */ public Options selectCols(Long... selectCols) { @@ -290,7 +298,9 @@ public static class Inputs extends RawOpInputs { public final String naValue; /** - * The selectCols attribute + * Optional sorted list of column indices to select. If specified, + * only this subset of columns will be parsed and returned. + * It only works on {@code records} except for {@code record_defaults}. */ public final long[] selectCols; 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 9461d599888..807724d575d 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 @@ -79,7 +79,8 @@ public ComplexAbs(Operation operation) { * * @param scope current scope * @param x The x value - * @param Tout The value of the Tout attribute + * @param Tout Need to be {@code tf.float32} when the type of {@code x} is {@code tf.complex64}. + * Need to be {@code tf.float64} when the type of {@code x} is {@code tf.complex128}. * @param data type for {@code ComplexAbs} output and operands * @return a new instance of ComplexAbs */ @@ -137,7 +138,8 @@ public static class Inputs extends RawOpInputs> { public final DataType T; /** - * The Tout attribute + * Need to be {@code tf.float32} when the type of {@code x} is {@code tf.complex64}. + * Need to be {@code tf.float64} when the type of {@code x} is {@code tf.complex128}. */ public final DataType Tout; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DenseBincount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DenseBincount.java index 808be372c5f..f4581fe9844 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DenseBincount.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DenseBincount.java @@ -69,9 +69,9 @@ public DenseBincount(Operation operation) { * @param scope current scope * @param input 1D or 2D int {@code Tensor}. * @param sizeOutput non-negative int scalar {@code Tensor}. - * @param weights is an int32, int64, float32, or float64 {@code Tensor} with the same - * shape as {@code arr}, or a length-0 {@code Tensor}, in which case it acts as all weights - * equal to 1. + * @param weights {@code Tensor} with the same shape as {@code arr}, or a length-0 {@code Tensor}, + * in which case it acts as all weights equal to 1. + * Not supported by the GPU implementation of Bincount. * @param options carries optional attribute values * @param data type for {@code DenseBincount} output and operands * @param data type for {@code DenseBincount} output and operands @@ -99,7 +99,9 @@ public static DenseBincount create(Sco /** * Sets the binaryOutput option. * - * @param binaryOutput bool; Whether the kernel should count the appearance or number of occurrences. + * @param binaryOutput Whether the kernel should count the appearance or number of occurrences. + * Will raise {@code UnimplementedError} when {@code binary_output} is specified to {@code True} + * and the size of {@code weights} is not 0. * @return this Options instance. */ public static Options binaryOutput(Boolean binaryOutput) { @@ -133,7 +135,9 @@ private Options() { /** * Sets the binaryOutput option. * - * @param binaryOutput bool; Whether the kernel should count the appearance or number of occurrences. + * @param binaryOutput Whether the kernel should count the appearance or number of occurrences. + * Will raise {@code UnimplementedError} when {@code binary_output} is specified to {@code True} + * and the size of {@code weights} is not 0. * @return this Options instance. */ public Options binaryOutput(Boolean binaryOutput) { @@ -157,9 +161,9 @@ public static class Inputs extends RawOpIn public final Operand sizeOutput; /** - * is an int32, int64, float32, or float64 {@code Tensor} with the same - * shape as {@code arr}, or a length-0 {@code Tensor}, in which case it acts as all weights - * equal to 1. + * {@code Tensor} with the same shape as {@code arr}, or a length-0 {@code Tensor}, + * in which case it acts as all weights equal to 1. + * Not supported by the GPU implementation of Bincount. */ public final Operand weights; @@ -174,7 +178,9 @@ public static class Inputs extends RawOpIn public final DataType T; /** - * bool; Whether the kernel should count the appearance or number of occurrences. + * Whether the kernel should count the appearance or number of occurrences. + * Will raise {@code UnimplementedError} when {@code binary_output} is specified to {@code True} + * and the size of {@code weights} is not 0. */ public final boolean binaryOutput; 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 509de2b8c7b..ce739b420de 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 @@ -74,7 +74,8 @@ public Imag(Operation operation) { * * @param scope current scope * @param input The input value - * @param Tout The value of the Tout attribute + * @param Tout Need to be {@code tf.float32} when the type of {@code x} is {@code tf.complex64}. + * Need to be {@code tf.float64} when the type of {@code x} is {@code tf.complex128}. * @param data type for {@code Imag} output and operands * @return a new instance of Imag */ @@ -132,7 +133,8 @@ public static class Inputs extends RawOpInputs> { public final DataType T; /** - * The Tout attribute + * Need to be {@code tf.float32} when the type of {@code x} is {@code tf.complex64}. + * Need to be {@code tf.float64} when the type of {@code x} is {@code tf.complex128}. */ public final DataType Tout; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/IsotonicRegression.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/IsotonicRegression.java index ecd511253e8..73ea2a63c84 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/IsotonicRegression.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/IsotonicRegression.java @@ -68,7 +68,15 @@ public IsotonicRegression(Operation operation) { * * @param scope current scope * @param input A (batch_size, dim)-tensor holding a batch of inputs. - * @param outputDtype Dtype of output. + * @param outputDtype Dtype of the output tensor. + *

Note on supported input-output type combinations: + *

    + *
  • For floating-point types, the output has the same dtype as the input.
    • + *
  • For 8-bit and 16-bit integer inputs, the output is a 32-bit float.
    • + *
  • For 32-bit and 64-bit integer inputs, the output is a 64-bit float.
    • + *
+ *

Using unsupported dtype pairs (for example, input=float64 with output=float32) + * will result in a "Could not find device for node" error. * @param data type for {@code IsotonicRegression} output and operands * @return a new instance of IsotonicRegression */ @@ -130,7 +138,15 @@ public static class Inputs extends RawOpInputs> { public final DataType T; /** - * Dtype of output. + * Dtype of the output tensor. + *

Note on supported input-output type combinations: + *

    + *
  • For floating-point types, the output has the same dtype as the input.
    • + *
  • For 8-bit and 16-bit integer inputs, the output is a 32-bit float.
    • + *
  • For 32-bit and 64-bit integer inputs, the output is a 64-bit float.
    • + *
+ *

Using unsupported dtype pairs (for example, input=float64 with output=float32) + * will result in a "Could not find device for node" error. */ public final DataType outputDtype; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Quantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Quantize.java index ed34d301ec7..e6987733af8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Quantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Quantize.java @@ -219,7 +219,7 @@ public static Options mode(String mode) { /** * Sets the roundMode option. * - * @param roundMode the roundMode option + * @param roundMode {@code round_mode='HALF_TO_EVEN'} only supported for mode 'SCALED'. * @return this Options instance. */ public static Options roundMode(String roundMode) { @@ -320,7 +320,7 @@ public Options mode(String mode) { /** * Sets the roundMode option. * - * @param roundMode the roundMode option + * @param roundMode {@code round_mode='HALF_TO_EVEN'} only supported for mode 'SCALED'. * @return this Options instance. */ public Options roundMode(String roundMode) { @@ -398,7 +398,7 @@ public static class Inputs extends RawOpInputs> { public final String mode; /** - * The roundMode attribute + * {@code round_mode='HALF_TO_EVEN'} only supported for mode 'SCALED'. */ public final String roundMode; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4Grad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4Grad.java index 65cf77c43ca..097901b206c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4Grad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4Grad.java @@ -71,8 +71,10 @@ public QuantizeAndDequantizeV4Grad(Operation operation) { * @param scope current scope * @param gradients The gradients value * @param input The input value - * @param inputMin The inputMin value - * @param inputMax The inputMax value + * @param inputMin If {@code axis} is specified, the shape of the minimum input tensor + * must be rank 1. + * @param inputMax If {@code axis} is specified, the shape of the maximum input tensor + * must be rank 1. * @param options carries optional attribute values * @param data type for {@code QuantizeAndDequantizeV4Grad} output and operands * @return a new instance of QuantizeAndDequantizeV4Grad @@ -171,12 +173,14 @@ public static class Inputs extends RawOpInputs input; /** - * The inputMin input + * If {@code axis} is specified, the shape of the minimum input tensor + * must be rank 1. */ public final Operand inputMin; /** - * The inputMax input + * If {@code axis} is specified, the shape of the maximum input tensor + * must be rank 1. */ public final Operand inputMax; 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 c4d7b74e39a..7aeb9f690dc 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 @@ -72,9 +72,10 @@ public Rfft(Operation operation) { * Factory method to create a class wrapping a new RFFT operation. * * @param scope current scope - * @param input A float32 tensor. + * @param input A float32 or float64 tensor. * @param fftLength An int32 tensor of shape [1]. The FFT length. - * @param Tcomplex The value of the Tcomplex attribute + * @param Tcomplex Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. * @param data type for {@code RFFT} output and operands * @return a new instance of Rfft */ @@ -114,7 +115,7 @@ public Output asOutput() { ) public static class Inputs extends RawOpInputs> { /** - * A float32 tensor. + * A float32 or float64 tensor. */ public final Operand input; @@ -129,7 +130,8 @@ public static class Inputs extends RawOpInputs> { public final DataType Treal; /** - * The Tcomplex attribute + * Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. */ public final DataType Tcomplex; 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 314d16f4eec..d440d3b706c 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 @@ -73,9 +73,10 @@ public Rfft2d(Operation operation) { * Factory method to create a class wrapping a new RFFT2D operation. * * @param scope current scope - * @param input A float32 tensor. + * @param input A float32 or float64 tensor. * @param fftLength An int32 tensor of shape [2]. The FFT length for each dimension. - * @param Tcomplex The value of the Tcomplex attribute + * @param Tcomplex Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. * @param data type for {@code RFFT2D} output and operands * @return a new instance of Rfft2d */ @@ -116,7 +117,7 @@ public Output asOutput() { ) public static class Inputs extends RawOpInputs> { /** - * A float32 tensor. + * A float32 or float64 tensor. */ public final Operand input; @@ -131,7 +132,8 @@ public static class Inputs extends RawOpInputs> { public final DataType Treal; /** - * The Tcomplex attribute + * Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. */ public final DataType Tcomplex; 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 282c4b7386e..92b44cfd563 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 @@ -73,9 +73,10 @@ public Rfft3d(Operation operation) { * Factory method to create a class wrapping a new RFFT3D operation. * * @param scope current scope - * @param input A float32 tensor. + * @param input A float32 or float64 tensor. * @param fftLength An int32 tensor of shape [3]. The FFT length for each dimension. - * @param Tcomplex The value of the Tcomplex attribute + * @param Tcomplex Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. * @param data type for {@code RFFT3D} output and operands * @return a new instance of Rfft3d */ @@ -116,7 +117,7 @@ public Output asOutput() { ) public static class Inputs extends RawOpInputs> { /** - * A float32 tensor. + * A float32 or float64 tensor. */ public final Operand input; @@ -131,7 +132,8 @@ public static class Inputs extends RawOpInputs> { public final DataType Treal; /** - * The Tcomplex attribute + * Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. */ public final DataType Tcomplex; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/RfftNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/RfftNd.java index 17bf1368600..72183e79a42 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/RfftNd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/RfftNd.java @@ -73,10 +73,11 @@ public RfftNd(Operation operation) { * Factory method to create a class wrapping a new RFFTND operation. * * @param scope current scope - * @param input A complex tensor. + * @param input A float32 or float64 tensor. * @param fftLength An int32 tensor. The FFT length for each dimension. * @param axes An int32 tensor with a same shape as fft_length. Axes to perform the transform. - * @param Tcomplex The value of the Tcomplex attribute + * @param Tcomplex Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. * @param data type for {@code RFFTND} output and operands * @return a new instance of RfftNd */ @@ -116,7 +117,7 @@ public Output asOutput() { ) public static class Inputs extends RawOpInputs> { /** - * A complex tensor. + * A float32 or float64 tensor. */ public final Operand input; @@ -136,7 +137,8 @@ public static class Inputs extends RawOpInputs> { public final DataType Treal; /** - * The Tcomplex attribute + * Should be {@code tf.complex64} when the type of {@code input} is {@code float32}. + * Should be {@code tf.complex128} when the type of {@code input} is {@code float64}. */ public final DataType Tcomplex; diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/TensorFlowTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/TensorFlowTest.java index edf7bcd7190..a3626bfcdc8 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/TensorFlowTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/TensorFlowTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.nio.file.Paths; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.tensorflow.proto.OpList; @@ -38,6 +39,7 @@ public void registeredOpList() { assertNotNull(TensorFlow.registeredOpList()); } + @Disabled // until a version of tensorflow-text that's compatible with v2.21.0 @Test public void loadTFTextLibrary() { String libname = diff --git a/tensorflow-core/tensorflow-core-native/.bazelversion b/tensorflow-core/tensorflow-core-native/.bazelversion index 5c733d6c13a..26c75fe8ad4 100644 --- a/tensorflow-core/tensorflow-core-native/.bazelversion +++ b/tensorflow-core/tensorflow-core-native/.bazelversion @@ -1,2 +1,2 @@ -7.4.1 +7.7.0 # NOTE: Update Bazel version in tensorflow/tools/ci_build/release/common.sh.oss \ No newline at end of file diff --git a/tensorflow-core/tensorflow-core-native/BUILD b/tensorflow-core/tensorflow-core-native/BUILD index f480e638867..9d658d37a5d 100644 --- a/tensorflow-core/tensorflow-core-native/BUILD +++ b/tensorflow-core/tensorflow-core-native/BUILD @@ -4,6 +4,6 @@ java_proto_library( name = "java_proto_gen_sources", deps = [ "@org_tensorflow//tensorflow/core:protos_all", - "@local_xla//xla/tsl/protobuf:protos_all" + "@xla//xla/tsl/protobuf:protos_all" ] ) diff --git a/tensorflow-core/tensorflow-core-native/WORKSPACE b/tensorflow-core/tensorflow-core-native/WORKSPACE index a0f6b30323e..428352c0167 100644 --- a/tensorflow-core/tensorflow-core-native/WORKSPACE +++ b/tensorflow-core/tensorflow-core-native/WORKSPACE @@ -18,25 +18,54 @@ http_archive( "find tensorflow third_party/xla/third_party/tsl third_party/xla/xla/tsl -name \\*.proto | xargs sed -i.bak 's/^package tensorflow\\([^;]*\\).*$/package tensorflow\\1;\\noption java_package = \"org.tensorflow.proto\\1\";/'", ], urls = [ - "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.20.0.tar.gz", + "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.21.0.tar.gz", ], - sha256 = "a640d1f97be316a09301dfc9347e3d929ad4d9a2336e3ca23c32c93b0ff7e5d0", - strip_prefix = "tensorflow-2.20.0" + sha256 = "ef3568bb4865d6c1b2564fb5689c19b6b9a5311572cd1f2ff9198636a8520921", + strip_prefix = "tensorflow-2.21.0" ) ##### Copy content of tensorflow/WORKSPACE here (make sure to change references of default package "//" to "@org_tensorflow//") - # buildifier: disable=load-on-top -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@org_tensorflow//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls") -http_archive( +tf_http_archive( name = "rules_shell", sha256 = "bc61ef94facc78e20a645726f64756e5e285a045037c7a61f65af2941f4c25e1", strip_prefix = "rules_shell-0.4.1", - url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.4.1/rules_shell-v0.4.1.tar.gz", + urls = tf_mirror_urls( + "https://github.com/bazelbuild/rules_shell/releases/download/v0.4.1/rules_shell-v0.4.1.tar.gz", + ), ) +# Initialize toolchains for ML projects. +# +# A hermetic build system is designed to produce completely reproducible builds for C++. +# Details: https://github.com/google-ml-infra/rules_ml_toolchain +tf_http_archive( + name = "rules_ml_toolchain", + sha256 = "54c1a357f71f611efdb4891ebd4bcbe4aeb6dfa7e473f14fd7ecad5062096616", + strip_prefix = "rules_ml_toolchain-d8cb9c2c168cd64000eaa6eda0781a9615a26ffe", + urls = tf_mirror_urls( + "https://github.com/google-ml-infra/rules_ml_toolchain/archive/d8cb9c2c168cd64000eaa6eda0781a9615a26ffe.tar.gz", + ), +) + +load( + "@rules_ml_toolchain//cc/deps:cc_toolchain_deps.bzl", + "cc_toolchain_deps", +) + +cc_toolchain_deps() + +register_toolchains("@rules_ml_toolchain//cc:linux_x86_64_linux_x86_64") + +register_toolchains("@rules_ml_toolchain//cc:linux_x86_64_linux_x86_64_cuda") + +register_toolchains("@rules_ml_toolchain//cc:linux_aarch64_linux_aarch64") + +register_toolchains("@rules_ml_toolchain//cc:linux_aarch64_linux_aarch64_cuda") + # Initialize the TensorFlow repository and all dependencies. # # The cascade of load() statements and tf_workspace?() calls works around the @@ -54,11 +83,11 @@ rules_shell_dependencies() rules_shell_toolchains() # Initialize hermetic Python -load("@local_xla//third_party/py:python_init_rules.bzl", "python_init_rules") +load("@xla//third_party/py:python_init_rules.bzl", "python_init_rules") python_init_rules() -load("@local_xla//third_party/py:python_init_repositories.bzl", "python_init_repositories") +load("@xla//third_party/py:python_init_repositories.bzl", "python_init_repositories") python_init_repositories( default_python_version = "system", @@ -69,7 +98,6 @@ python_init_repositories( ], local_wheel_workspaces = ["@org_tensorflow//:WORKSPACE"], requirements = { - "3.9": "@org_tensorflow//:requirements_lock_3_9.txt", "3.10": "@org_tensorflow//:requirements_lock_3_10.txt", "3.11": "@org_tensorflow//:requirements_lock_3_11.txt", "3.12": "@org_tensorflow//:requirements_lock_3_12.txt", @@ -77,11 +105,11 @@ python_init_repositories( }, ) -load("@local_xla//third_party/py:python_init_toolchains.bzl", "python_init_toolchains") +load("@xla//third_party/py:python_init_toolchains.bzl", "python_init_toolchains") python_init_toolchains() -load("@local_xla//third_party/py:python_init_pip.bzl", "python_init_pip") +load("@xla//third_party/py:python_init_pip.bzl", "python_init_pip") python_init_pip() @@ -94,13 +122,6 @@ load("@org_tensorflow//tensorflow:workspace2.bzl", "tf_workspace2") tf_workspace2() -# Added to fix macOS compiler support on Tahoe? -#http_archive( -# name = "build_bazel_apple_support", -# sha256 = "1ae6fcf983cff3edab717636f91ad0efff2e5ba75607fdddddfd6ad0dbdfaf10", -# urls = ["https://github.com/bazelbuild/apple_support/releases/download/1.24.5/apple_support.1.24.5.tar.gz"] -#) - load("@org_tensorflow//tensorflow:workspace1.bzl", "tf_workspace1") tf_workspace1() @@ -110,14 +131,20 @@ load("@org_tensorflow//tensorflow:workspace0.bzl", "tf_workspace0") tf_workspace0() load( - "@local_xla//third_party/py:python_wheel.bzl", + "@xla//third_party/py:python_wheel.bzl", + "nvidia_wheel_versions_repository", "python_wheel_version_suffix_repository", ) +nvidia_wheel_versions_repository( + name = "nvidia_wheel_versions", + versions_source = "//ci/official/requirements_updater:nvidia-requirements.txt", +) + python_wheel_version_suffix_repository(name = "tf_wheel_version_suffix") load( - "@rules_ml_toolchain//third_party/gpus/cuda/hermetic:cuda_json_init_repository.bzl", + "@rules_ml_toolchain//gpu/cuda:cuda_json_init_repository.bzl", "cuda_json_init_repository", ) @@ -129,13 +156,19 @@ load( "CUDNN_REDISTRIBUTIONS", ) load( - "@rules_ml_toolchain//third_party/gpus/cuda/hermetic:cuda_redist_init_repositories.bzl", + "@rules_ml_toolchain//gpu/cuda:cuda_redist_init_repositories.bzl", "cuda_redist_init_repositories", "cudnn_redist_init_repository", ) +load( + "@rules_ml_toolchain//gpu/cuda:cuda_redist_versions.bzl", + "REDIST_VERSIONS_TO_BUILD_TEMPLATES", +) +load("@xla//third_party/cccl:workspace.bzl", "CCCL_DIST_DICT", "CCCL_GITHUB_VERSIONS_TO_BUILD_TEMPLATES") cuda_redist_init_repositories( - cuda_redistributions = CUDA_REDISTRIBUTIONS, + cuda_redistributions = CUDA_REDISTRIBUTIONS | CCCL_DIST_DICT, + redist_versions_to_build_templates = REDIST_VERSIONS_TO_BUILD_TEMPLATES | CCCL_GITHUB_VERSIONS_TO_BUILD_TEMPLATES, ) cudnn_redist_init_repository( @@ -143,28 +176,28 @@ cudnn_redist_init_repository( ) load( - "@rules_ml_toolchain//third_party/gpus/cuda/hermetic:cuda_configure.bzl", + "@rules_ml_toolchain//gpu/cuda:cuda_configure.bzl", "cuda_configure", ) cuda_configure(name = "local_config_cuda") load( - "@rules_ml_toolchain//third_party/nccl/hermetic:nccl_redist_init_repository.bzl", + "@rules_ml_toolchain//gpu/nccl:nccl_redist_init_repository.bzl", "nccl_redist_init_repository", ) nccl_redist_init_repository() load( - "@rules_ml_toolchain//third_party/nccl/hermetic:nccl_configure.bzl", + "@rules_ml_toolchain//gpu/nccl:nccl_configure.bzl", "nccl_configure", ) nccl_configure(name = "local_config_nccl") load( - "@rules_ml_toolchain//third_party/nvshmem/hermetic:nvshmem_json_init_repository.bzl", + "@rules_ml_toolchain//gpu/nvshmem:nvshmem_json_init_repository.bzl", "nvshmem_json_init_repository", ) @@ -175,28 +208,10 @@ load( "NVSHMEM_REDISTRIBUTIONS", ) load( - "@rules_ml_toolchain//third_party/nvshmem/hermetic:nvshmem_redist_init_repository.bzl", + "@rules_ml_toolchain//gpu/nvshmem:nvshmem_redist_init_repository.bzl", "nvshmem_redist_init_repository", ) nvshmem_redist_init_repository( nvshmem_redistributions = NVSHMEM_REDISTRIBUTIONS, ) - -load( - "@rules_ml_toolchain//third_party/nvshmem/hermetic:nvshmem_configure.bzl", - "nvshmem_configure", -) - -nvshmem_configure(name = "local_config_nvshmem") - -load( - "@rules_ml_toolchain//cc_toolchain/deps:cc_toolchain_deps.bzl", - "cc_toolchain_deps", -) - -cc_toolchain_deps() - -register_toolchains("@rules_ml_toolchain//cc_toolchain:lx64_lx64") - -register_toolchains("@rules_ml_toolchain//cc_toolchain:lx64_lx64_cuda") \ No newline at end of file diff --git a/tensorflow-core/tensorflow-core-native/scripts/bazel_generate.sh b/tensorflow-core/tensorflow-core-native/scripts/bazel_generate.sh index ab0fd0ec6c1..cb5b82f4461 100755 --- a/tensorflow-core/tensorflow-core-native/scripts/bazel_generate.sh +++ b/tensorflow-core/tensorflow-core-native/scripts/bazel_generate.sh @@ -6,8 +6,7 @@ source $(pwd -P)/scripts/bazel_common.sh echo "Generate sources with Bazel" # Build C/C++ API of TensorFlow itself including a target to generate ops for Java ${BAZEL_CMD:=bazel} --bazelrc=tensorflow.bazelrc $BUILD_FLAGS ${BUILD_USER_FLAGS:-} \ - @org_tensorflow//tensorflow/tools/lib_package:jnilicenses_generate \ - :java_proto_gen_sources + @org_tensorflow//tensorflow/tools/lib_package:libtensorflow_proto :java_proto_gen_sources echo "Rebuilding generated source directories" GEN_SRCS_DIR=src/gen/java @@ -26,5 +25,5 @@ cp -rf $TENSORFLOW_SRCS/core/api_def/base_api $GEN_RESOURCE_DIR/org/tensorflow/ # Copy generated Java protos from source jars echo "Extracting TF/TSL/XLA proto Java sources" cd $GEN_SRCS_DIR -find $TENSORFLOW_BIN $BAZEL_BIN/external/local_tsl/tsl $BAZEL_BIN/external/local_xla/xla -name \*-speed-src.jar -exec jar xf {} \; +find $TENSORFLOW_BIN $BAZEL_BIN/external/tsl/tsl $BAZEL_BIN/external/xla/xla -name \*-speed-src.jar -exec jar xf {} \; rm -rf META-INF diff --git a/tensorflow-core/tensorflow-core-native/scripts/dist_download.sh b/tensorflow-core/tensorflow-core-native/scripts/dist_download.sh index 54ffca74ac0..0c3cf8c3cf0 100755 --- a/tensorflow-core/tensorflow-core-native/scripts/dist_download.sh +++ b/tensorflow-core/tensorflow-core-native/scripts/dist_download.sh @@ -5,16 +5,16 @@ DOWNLOAD_FOLDER="$1" case ${PLATFORM:-} in 'linux-x86_64') - WHEEL_URL='https://files.pythonhosted.org/packages/1a/9e/594164db23e3e262da1a0e8983258811eff56e5af6b7b6da5eccccb8d4c7/tensorflow_cpu-2.20.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl' + WHEEL_URL='https://files.pythonhosted.org/packages/ac/21/48cd18bfd214042ecb7392e01e016d3dd60b4f1ef13f10954ab472cd3c13/tensorflow_cpu-2.21.0-cp313-cp313-manylinux_2_27_x86_64.whl' ;; 'linux-x86_64-gpu') - WHEEL_URL='https://files.pythonhosted.org/packages/43/fb/8be8547c128613d82a2b006004026d86ed0bd672e913029a98153af4ffab/tensorflow-2.20.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl' + WHEEL_URL='https://files.pythonhosted.org/packages/86/6c/10d075ffc09754c7f10e749ba3c9d46dd809fb007990c7f788128044180c/tensorflow-2.21.0-cp313-cp313-manylinux_2_27_x86_64.whl' ;; 'linux-arm64') - WHEEL_URL='https://files.pythonhosted.org/packages/ea/4c/c1aa90c5cc92e9f7f9c78421e121ef25bae7d378f8d1d4cbad46c6308836/tensorflow-2.20.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl' + WHEEL_URL='https://files.pythonhosted.org/packages/72/72/343b86b4c9bfe28e81f749439f908c1e26aeac73d9f12b8dcdb996eb8ecb/tensorflow-2.21.0-cp313-cp313-manylinux_2_27_aarch64.whl' ;; 'macosx-arm64') - WHEEL_URL='https://files.pythonhosted.org/packages/04/82/af283f402f8d1e9315644a331a5f0f326264c5d1de08262f3de5a5ade422/tensorflow-2.20.0-cp313-cp313-macosx_12_0_arm64.whl' + WHEEL_URL='https://files.pythonhosted.org/packages/40/09/268b45a61be2bce136dabf3a3cd7099c8a984ae398198f71920b4c60c502/tensorflow-2.21.0-cp313-cp313-macosx_12_0_arm64.whl' ;; *) echo "TensorFlow distribution for ${PLATFORM} is not supported for download" diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/TF_TString_View.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/TF_TString_View.java index e3cac3b45a2..0949de62d34 100644 --- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/TF_TString_View.java +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/TF_TString_View.java @@ -29,4 +29,5 @@ public class TF_TString_View extends Pointer { // NOLINT public native @Cast("size_t") long size(); public native TF_TString_View size(long setter); public native @Cast("const char*") BytePointer ptr(); public native TF_TString_View ptr(BytePointer setter); + public native TStringOwnerCApi owner_ref(); public native TF_TString_View owner_ref(TStringOwnerCApi setter); } diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/TStringOwnerCApi.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/TStringOwnerCApi.java new file mode 100644 index 00000000000..cd37da92516 --- /dev/null +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/TStringOwnerCApi.java @@ -0,0 +1,33 @@ +// Targeted by JavaCPP version 1.5.12: DO NOT EDIT THIS FILE + +package org.tensorflow.internal.c_api; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.tensorflow.internal.c_api.global.tensorflow.*; + + +@Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class) +public class TStringOwnerCApi extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public TStringOwnerCApi() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public TStringOwnerCApi(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public TStringOwnerCApi(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public TStringOwnerCApi position(long position) { + return (TStringOwnerCApi)super.position(position); + } + @Override public TStringOwnerCApi getPointer(long i) { + return new TStringOwnerCApi((Pointer)this).offsetAddress(i); + } + + public native tstring_owner_ref_t ref(); public native TStringOwnerCApi ref(tstring_owner_ref_t setter); + public native tstring_owner_unref_t unref(); public native TStringOwnerCApi unref(tstring_owner_unref_t setter); + public native Pointer obj(); public native TStringOwnerCApi obj(Pointer setter); // Opaque pointer to the C++ owner object +} diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java index 48a6a3ded36..243c7165ee0 100644 --- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java @@ -32,6 +32,7 @@ public class tensorflow extends org.tensorflow.internal.c_api.presets.tensorflow // #define TENSORFLOW_TSL_PLATFORM_CTSTRING_INTERNAL_H_ // #include +// #include // IWYU pragma: keep, provides bool // #include // #include // #include @@ -75,6 +76,15 @@ public class tensorflow extends org.tensorflow.internal.c_api.presets.tensorflow TF_TSTR_OFFSET = 0x02, TF_TSTR_VIEW = 0x03, TF_TSTR_TYPE_MASK = 0x03; +// Targeting ../tstring_owner_ref_t.java + + +// Targeting ../tstring_owner_unref_t.java + + +// Targeting ../TStringOwnerCApi.java + + // Targeting ../TF_TString_Large.java @@ -141,6 +151,13 @@ public static native void TF_TString_ReserveAmortized(TF_TString str, public static native @Cast("char*") BytePointer TF_TString_Resize(TF_TString str, @Cast("size_t") long new_size, @Cast("char") byte c); +public static native void TF_TString_AssignViewWithOwner(TF_TString dst, + @Cast("const char*") BytePointer src, @Cast("size_t") long size, + TStringOwnerCApi owner_ref); +public static native void TF_TString_AssignViewWithOwner(TF_TString dst, + String src, @Cast("size_t") long size, + TStringOwnerCApi owner_ref); + public static native void TF_TString_AssignView(TF_TString dst, @Cast("const char*") BytePointer src, @Cast("size_t") long size); public static native void TF_TString_AssignView(TF_TString dst, String src, @@ -248,6 +265,9 @@ public static native void TF_TString_Copy(TF_TString dst, String src, // will result in a copy into an owned SMALL or LARGE type, and will not modify // `src'. +// Sets `dst' as an owning VIEW type to `src', taking shared ownership via +// `owner_ref`. If `owner_ref` is null, behaves as TF_TString_AssignView. + // Appends `src' onto `dst'. If `dst' is a VIEW or OFFSET type, it will first // be converted to an owned LARGE or SMALL type. `dst' should not point to // memory owned by `src'. @@ -477,7 +497,8 @@ public static native void TF_TString_Copy(TF_TString dst, String src, TF_INT4 = 29, TF_UINT4 = 30, TF_INT2 = 31, - TF_UINT2 = 32; + TF_UINT2 = 32, + TF_FLOAT4_E2M1FN = 33; // 2 exponent bits, 1 mantissa bit, finite-only // TF_DataTypeSize returns the sizeof() for the underlying type corresponding // to the given TF_DataType enum value. Returns 0 for variable length types @@ -5337,8 +5358,8 @@ public static native void TF_GraphRemoveFunction(TF_Graph g, /** Registers a gradient function for operations of type {@code op_type}. * * Returns true if the function has been registered successfully, false if operation failed or if gradient function is already registered to that {@code op_type}. */ -public static native @Cast("bool") boolean TFJ_RegisterCustomGradient(@Cast("const char*") BytePointer op_type, TFJ_GradFuncAdapter custom_gradient_adapter); -public static native @Cast("bool") boolean TFJ_RegisterCustomGradient(String op_type, TFJ_GradFuncAdapter custom_gradient_adapter); +public static native @Cast("bool") boolean TFJ_RegisterCustomGradient(@Cast("const char*") BytePointer op_type, @Cast("TFJ_GradFuncAdapter") TFJ_GradFuncAdapter custom_gradient_adapter); +public static native @Cast("bool") boolean TFJ_RegisterCustomGradient(@Cast("const char*") String op_type, @Cast("TFJ_GradFuncAdapter") TFJ_GradFuncAdapter custom_gradient_adapter); // #include "tfj_gradients_impl.cc" // include CC file in its header to compile it with JavaCPP diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/tstring_owner_ref_t.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/tstring_owner_ref_t.java new file mode 100644 index 00000000000..a1454d93a00 --- /dev/null +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/tstring_owner_ref_t.java @@ -0,0 +1,22 @@ +// Targeted by JavaCPP version 1.5.12: DO NOT EDIT THIS FILE + +package org.tensorflow.internal.c_api; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.tensorflow.internal.c_api.global.tensorflow.*; + + +// C-compatible API for tstring shared ownership. + +@Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class) +public class tstring_owner_ref_t extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public tstring_owner_ref_t(Pointer p) { super(p); } + protected tstring_owner_ref_t() { allocate(); } + private native void allocate(); + public native void call(TStringOwnerCApi self); +} diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/tstring_owner_unref_t.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/tstring_owner_unref_t.java new file mode 100644 index 00000000000..547e149e074 --- /dev/null +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api/tstring_owner_unref_t.java @@ -0,0 +1,19 @@ +// Targeted by JavaCPP version 1.5.12: DO NOT EDIT THIS FILE + +package org.tensorflow.internal.c_api; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.tensorflow.internal.c_api.global.tensorflow.*; + +@Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class) +public class tstring_owner_unref_t extends FunctionPointer { + static { Loader.load(); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public tstring_owner_unref_t(Pointer p) { super(p); } + protected tstring_owner_unref_t() { allocate(); } + private native void allocate(); + public native @Cast("bool") boolean call(TStringOwnerCApi self); +} diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescription.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescription.java index 967073358af..610a2e94e39 100644 --- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescription.java +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescription.java @@ -1,13 +1,14 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: tensorflow/core/framework/allocation_description.proto -// Protobuf Java Version: 4.28.3 +// Protobuf Java Version: 4.31.1 package org.tensorflow.proto; /** * Protobuf type {@code tensorflow.AllocationDescription} */ +@com.google.protobuf.Generated public final class AllocationDescription extends com.google.protobuf.GeneratedMessage implements // @@protoc_insertion_point(message_implements:tensorflow.AllocationDescription) @@ -17,8 +18,8 @@ public final class AllocationDescription extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", AllocationDescription.class.getName()); } diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescriptionOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescriptionOrBuilder.java index bb64ef9e0c4..17f0f069d8c 100644 --- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescriptionOrBuilder.java +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescriptionOrBuilder.java @@ -1,10 +1,11 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: tensorflow/core/framework/allocation_description.proto -// Protobuf Java Version: 4.28.3 +// Protobuf Java Version: 4.31.1 package org.tensorflow.proto; +@com.google.protobuf.Generated public interface AllocationDescriptionOrBuilder extends // @@protoc_insertion_point(interface_extends:tensorflow.AllocationDescription) com.google.protobuf.MessageOrBuilder { diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescriptionProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescriptionProtos.java index 80ca6baa735..767f668b0c3 100644 --- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescriptionProtos.java +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationDescriptionProtos.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: tensorflow/core/framework/allocation_description.proto -// Protobuf Java Version: 4.28.3 +// Protobuf Java Version: 4.31.1 package org.tensorflow.proto; +@com.google.protobuf.Generated public final class AllocationDescriptionProtos { private AllocationDescriptionProtos() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", AllocationDescriptionProtos.class.getName()); } diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationRecord.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationRecord.java index 64ef50b0cce..cb51bf021e9 100644 --- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationRecord.java +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationRecord.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: tensorflow/core/framework/step_stats.proto -// Protobuf Java Version: 4.28.3 +// Protobuf Java Version: 4.31.1 package org.tensorflow.proto; @@ -12,6 +12,7 @@ * * Protobuf type {@code tensorflow.AllocationRecord} */ +@com.google.protobuf.Generated public final class AllocationRecord extends com.google.protobuf.GeneratedMessage implements // @@protoc_insertion_point(message_implements:tensorflow.AllocationRecord) @@ -21,8 +22,8 @@ public final class AllocationRecord extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", AllocationRecord.class.getName()); } diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationRecordOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationRecordOrBuilder.java index 4825baf1aaf..52882ca8aa8 100644 --- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationRecordOrBuilder.java +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocationRecordOrBuilder.java @@ -1,10 +1,11 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: tensorflow/core/framework/step_stats.proto -// Protobuf Java Version: 4.28.3 +// Protobuf Java Version: 4.31.1 package org.tensorflow.proto; +@com.google.protobuf.Generated public interface AllocationRecordOrBuilder extends // @@protoc_insertion_point(interface_extends:tensorflow.AllocationRecord) com.google.protobuf.MessageOrBuilder { diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocatorMemoryUsed.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocatorMemoryUsed.java index 49e5a0df53f..e1335d5d9a2 100644 --- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocatorMemoryUsed.java +++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocatorMemoryUsed.java @@ -1,13 +1,14 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: tensorflow/core/framework/step_stats.proto -// Protobuf Java Version: 4.28.3 +// Protobuf Java Version: 4.31.1 package org.tensorflow.proto; /** * Protobuf type {@code tensorflow.AllocatorMemoryUsed} */ +@com.google.protobuf.Generated public final class AllocatorMemoryUsed extends com.google.protobuf.GeneratedMessage implements // @@protoc_insertion_point(message_implements:tensorflow.AllocatorMemoryUsed) @@ -17,8 +18,8 @@ public final class AllocatorMemoryUsed extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", AllocatorMemoryUsed.class.getName()); } @@ -573,7 +574,7 @@ public Builder mergeFrom(org.tensorflow.proto.AllocatorMemoryUsed other) { bitField0_ = (bitField0_ & ~0x00000010); allocationRecordsBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getAllocationRecordsFieldBuilder() : null; + internalGetAllocationRecordsFieldBuilder() : null; } else { allocationRecordsBuilder_.addAllMessages(other.allocationRecords_); } @@ -1087,7 +1088,7 @@ public Builder removeAllocationRecords(int index) { */ public org.tensorflow.proto.AllocationRecord.Builder getAllocationRecordsBuilder( int index) { - return getAllocationRecordsFieldBuilder().getBuilder(index); + return internalGetAllocationRecordsFieldBuilder().getBuilder(index); } /** * 

@@ -1126,7 +1127,7 @@ public org.tensorflow.proto.AllocationRecordOrBuilder getAllocationRecordsOrBuil
      * repeated .tensorflow.AllocationRecord allocation_records = 6;
      */
     public org.tensorflow.proto.AllocationRecord.Builder addAllocationRecordsBuilder() {
-      return getAllocationRecordsFieldBuilder().addBuilder(
+      return internalGetAllocationRecordsFieldBuilder().addBuilder(
           org.tensorflow.proto.AllocationRecord.getDefaultInstance());
     }
     /**
@@ -1138,7 +1139,7 @@ public org.tensorflow.proto.AllocationRecord.Builder addAllocationRecordsBuilder
      */
     public org.tensorflow.proto.AllocationRecord.Builder addAllocationRecordsBuilder(
         int index) {
-      return getAllocationRecordsFieldBuilder().addBuilder(
+      return internalGetAllocationRecordsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.AllocationRecord.getDefaultInstance());
     }
     /**
@@ -1150,11 +1151,11 @@ public org.tensorflow.proto.AllocationRecord.Builder addAllocationRecordsBuilder
      */
     public java.util.List 
          getAllocationRecordsBuilderList() {
-      return getAllocationRecordsFieldBuilder().getBuilderList();
+      return internalGetAllocationRecordsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.AllocationRecord, org.tensorflow.proto.AllocationRecord.Builder, org.tensorflow.proto.AllocationRecordOrBuilder> 
-        getAllocationRecordsFieldBuilder() {
+        internalGetAllocationRecordsFieldBuilder() {
       if (allocationRecordsBuilder_ == null) {
         allocationRecordsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.AllocationRecord, org.tensorflow.proto.AllocationRecord.Builder, org.tensorflow.proto.AllocationRecordOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocatorMemoryUsedOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocatorMemoryUsedOrBuilder.java
index 64564b22ffa..1b2ab921f83 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocatorMemoryUsedOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AllocatorMemoryUsedOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface AllocatorMemoryUsedOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.AllocatorMemoryUsed)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDef.java
index eba5e89cca2..307e7ad4b87 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/api_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -27,6 +27,7 @@
  *
  * Protobuf type {@code tensorflow.ApiDef}
  */
+@com.google.protobuf.Generated
 public final class ApiDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ApiDef)
@@ -36,8 +37,8 @@ public final class ApiDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ApiDef.class.getName());
   }
@@ -121,8 +122,8 @@ public enum Visibility
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Visibility.class.getName());
     }
@@ -219,7 +220,7 @@ public Visibility findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.ApiDef.getDescriptor().getEnumTypes().get(0);
     }
@@ -318,8 +319,8 @@ public static final class Endpoint extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Endpoint.class.getName());
     }
@@ -1106,8 +1107,8 @@ public static final class Arg extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Arg.class.getName());
     }
@@ -2060,8 +2061,8 @@ public static final class Attr extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Attr.class.getName());
     }
@@ -2506,7 +2507,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getDefaultValueFieldBuilder();
+          internalGetDefaultValueFieldBuilder();
         }
       }
       @java.lang.Override
@@ -2641,7 +2642,7 @@ public Builder mergeFrom(
               } // case 18
               case 26: {
                 input.readMessage(
-                    getDefaultValueFieldBuilder().getBuilder(),
+                    internalGetDefaultValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -2982,7 +2983,7 @@ public Builder clearDefaultValue() {
       public org.tensorflow.proto.AttrValue.Builder getDefaultValueBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getDefaultValueFieldBuilder().getBuilder();
+        return internalGetDefaultValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3014,7 +3015,7 @@ public org.tensorflow.proto.AttrValueOrBuilder getDefaultValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.AttrValue, org.tensorflow.proto.AttrValue.Builder, org.tensorflow.proto.AttrValueOrBuilder> 
-          getDefaultValueFieldBuilder() {
+          internalGetDefaultValueFieldBuilder() {
         if (defaultValueBuilder_ == null) {
           defaultValueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.AttrValue, org.tensorflow.proto.AttrValue.Builder, org.tensorflow.proto.AttrValueOrBuilder>(
@@ -4252,7 +4253,7 @@ public Builder mergeFrom(org.tensorflow.proto.ApiDef other) {
             bitField0_ = (bitField0_ & ~0x00000010);
             endpointBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getEndpointFieldBuilder() : null;
+                 internalGetEndpointFieldBuilder() : null;
           } else {
             endpointBuilder_.addAllMessages(other.endpoint_);
           }
@@ -4278,7 +4279,7 @@ public Builder mergeFrom(org.tensorflow.proto.ApiDef other) {
             bitField0_ = (bitField0_ & ~0x00000020);
             inArgBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getInArgFieldBuilder() : null;
+                 internalGetInArgFieldBuilder() : null;
           } else {
             inArgBuilder_.addAllMessages(other.inArg_);
           }
@@ -4304,7 +4305,7 @@ public Builder mergeFrom(org.tensorflow.proto.ApiDef other) {
             bitField0_ = (bitField0_ & ~0x00000040);
             outArgBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getOutArgFieldBuilder() : null;
+                 internalGetOutArgFieldBuilder() : null;
           } else {
             outArgBuilder_.addAllMessages(other.outArg_);
           }
@@ -4340,7 +4341,7 @@ public Builder mergeFrom(org.tensorflow.proto.ApiDef other) {
             bitField0_ = (bitField0_ & ~0x00000100);
             attrBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getAttrFieldBuilder() : null;
+                 internalGetAttrFieldBuilder() : null;
           } else {
             attrBuilder_.addAllMessages(other.attr_);
           }
@@ -4785,9 +4786,7 @@ public org.tensorflow.proto.ApiDef.Visibility getVisibility() {
      * @return This builder for chaining.
      */
     public Builder setVisibility(org.tensorflow.proto.ApiDef.Visibility value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000008;
       visibility_ = value.getNumber();
       onChanged();
@@ -4984,7 +4983,7 @@ public Builder removeEndpoint(int index) {
      */
     public org.tensorflow.proto.ApiDef.Endpoint.Builder getEndpointBuilder(
         int index) {
-      return getEndpointFieldBuilder().getBuilder(index);
+      return internalGetEndpointFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.ApiDef.Endpoint endpoint = 3;
@@ -5011,7 +5010,7 @@ public org.tensorflow.proto.ApiDef.EndpointOrBuilder getEndpointOrBuilder(
      * repeated .tensorflow.ApiDef.Endpoint endpoint = 3;
      */
     public org.tensorflow.proto.ApiDef.Endpoint.Builder addEndpointBuilder() {
-      return getEndpointFieldBuilder().addBuilder(
+      return internalGetEndpointFieldBuilder().addBuilder(
           org.tensorflow.proto.ApiDef.Endpoint.getDefaultInstance());
     }
     /**
@@ -5019,7 +5018,7 @@ public org.tensorflow.proto.ApiDef.Endpoint.Builder addEndpointBuilder() {
      */
     public org.tensorflow.proto.ApiDef.Endpoint.Builder addEndpointBuilder(
         int index) {
-      return getEndpointFieldBuilder().addBuilder(
+      return internalGetEndpointFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ApiDef.Endpoint.getDefaultInstance());
     }
     /**
@@ -5027,11 +5026,11 @@ public org.tensorflow.proto.ApiDef.Endpoint.Builder addEndpointBuilder(
      */
     public java.util.List 
          getEndpointBuilderList() {
-      return getEndpointFieldBuilder().getBuilderList();
+      return internalGetEndpointFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ApiDef.Endpoint, org.tensorflow.proto.ApiDef.Endpoint.Builder, org.tensorflow.proto.ApiDef.EndpointOrBuilder> 
-        getEndpointFieldBuilder() {
+        internalGetEndpointFieldBuilder() {
       if (endpointBuilder_ == null) {
         endpointBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ApiDef.Endpoint, org.tensorflow.proto.ApiDef.Endpoint.Builder, org.tensorflow.proto.ApiDef.EndpointOrBuilder>(
@@ -5224,7 +5223,7 @@ public Builder removeInArg(int index) {
      */
     public org.tensorflow.proto.ApiDef.Arg.Builder getInArgBuilder(
         int index) {
-      return getInArgFieldBuilder().getBuilder(index);
+      return internalGetInArgFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.ApiDef.Arg in_arg = 4;
@@ -5251,7 +5250,7 @@ public org.tensorflow.proto.ApiDef.ArgOrBuilder getInArgOrBuilder(
      * repeated .tensorflow.ApiDef.Arg in_arg = 4;
      */
     public org.tensorflow.proto.ApiDef.Arg.Builder addInArgBuilder() {
-      return getInArgFieldBuilder().addBuilder(
+      return internalGetInArgFieldBuilder().addBuilder(
           org.tensorflow.proto.ApiDef.Arg.getDefaultInstance());
     }
     /**
@@ -5259,7 +5258,7 @@ public org.tensorflow.proto.ApiDef.Arg.Builder addInArgBuilder() {
      */
     public org.tensorflow.proto.ApiDef.Arg.Builder addInArgBuilder(
         int index) {
-      return getInArgFieldBuilder().addBuilder(
+      return internalGetInArgFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ApiDef.Arg.getDefaultInstance());
     }
     /**
@@ -5267,11 +5266,11 @@ public org.tensorflow.proto.ApiDef.Arg.Builder addInArgBuilder(
      */
     public java.util.List 
          getInArgBuilderList() {
-      return getInArgFieldBuilder().getBuilderList();
+      return internalGetInArgFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ApiDef.Arg, org.tensorflow.proto.ApiDef.Arg.Builder, org.tensorflow.proto.ApiDef.ArgOrBuilder> 
-        getInArgFieldBuilder() {
+        internalGetInArgFieldBuilder() {
       if (inArgBuilder_ == null) {
         inArgBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ApiDef.Arg, org.tensorflow.proto.ApiDef.Arg.Builder, org.tensorflow.proto.ApiDef.ArgOrBuilder>(
@@ -5464,7 +5463,7 @@ public Builder removeOutArg(int index) {
      */
     public org.tensorflow.proto.ApiDef.Arg.Builder getOutArgBuilder(
         int index) {
-      return getOutArgFieldBuilder().getBuilder(index);
+      return internalGetOutArgFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.ApiDef.Arg out_arg = 5;
@@ -5491,7 +5490,7 @@ public org.tensorflow.proto.ApiDef.ArgOrBuilder getOutArgOrBuilder(
      * repeated .tensorflow.ApiDef.Arg out_arg = 5;
      */
     public org.tensorflow.proto.ApiDef.Arg.Builder addOutArgBuilder() {
-      return getOutArgFieldBuilder().addBuilder(
+      return internalGetOutArgFieldBuilder().addBuilder(
           org.tensorflow.proto.ApiDef.Arg.getDefaultInstance());
     }
     /**
@@ -5499,7 +5498,7 @@ public org.tensorflow.proto.ApiDef.Arg.Builder addOutArgBuilder() {
      */
     public org.tensorflow.proto.ApiDef.Arg.Builder addOutArgBuilder(
         int index) {
-      return getOutArgFieldBuilder().addBuilder(
+      return internalGetOutArgFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ApiDef.Arg.getDefaultInstance());
     }
     /**
@@ -5507,11 +5506,11 @@ public org.tensorflow.proto.ApiDef.Arg.Builder addOutArgBuilder(
      */
     public java.util.List 
          getOutArgBuilderList() {
-      return getOutArgFieldBuilder().getBuilderList();
+      return internalGetOutArgFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ApiDef.Arg, org.tensorflow.proto.ApiDef.Arg.Builder, org.tensorflow.proto.ApiDef.ArgOrBuilder> 
-        getOutArgFieldBuilder() {
+        internalGetOutArgFieldBuilder() {
       if (outArgBuilder_ == null) {
         outArgBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ApiDef.Arg, org.tensorflow.proto.ApiDef.Arg.Builder, org.tensorflow.proto.ApiDef.ArgOrBuilder>(
@@ -5869,7 +5868,7 @@ public Builder removeAttr(int index) {
      */
     public org.tensorflow.proto.ApiDef.Attr.Builder getAttrBuilder(
         int index) {
-      return getAttrFieldBuilder().getBuilder(index);
+      return internalGetAttrFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.ApiDef.Attr attr = 6;
@@ -5896,7 +5895,7 @@ public org.tensorflow.proto.ApiDef.AttrOrBuilder getAttrOrBuilder(
      * repeated .tensorflow.ApiDef.Attr attr = 6;
      */
     public org.tensorflow.proto.ApiDef.Attr.Builder addAttrBuilder() {
-      return getAttrFieldBuilder().addBuilder(
+      return internalGetAttrFieldBuilder().addBuilder(
           org.tensorflow.proto.ApiDef.Attr.getDefaultInstance());
     }
     /**
@@ -5904,7 +5903,7 @@ public org.tensorflow.proto.ApiDef.Attr.Builder addAttrBuilder() {
      */
     public org.tensorflow.proto.ApiDef.Attr.Builder addAttrBuilder(
         int index) {
-      return getAttrFieldBuilder().addBuilder(
+      return internalGetAttrFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ApiDef.Attr.getDefaultInstance());
     }
     /**
@@ -5912,11 +5911,11 @@ public org.tensorflow.proto.ApiDef.Attr.Builder addAttrBuilder(
      */
     public java.util.List 
          getAttrBuilderList() {
-      return getAttrFieldBuilder().getBuilderList();
+      return internalGetAttrFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ApiDef.Attr, org.tensorflow.proto.ApiDef.Attr.Builder, org.tensorflow.proto.ApiDef.AttrOrBuilder> 
-        getAttrFieldBuilder() {
+        internalGetAttrFieldBuilder() {
       if (attrBuilder_ == null) {
         attrBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ApiDef.Attr, org.tensorflow.proto.ApiDef.Attr.Builder, org.tensorflow.proto.ApiDef.AttrOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefOrBuilder.java
index 14dadfc1643..ad2c452e12d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/api_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ApiDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ApiDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefProtos.java
index 8c7940039f2..9323f9275ab 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/api_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ApiDefProtos {
   private ApiDefProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ApiDefProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefs.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefs.java
index a260fd1794e..521ccb486ac 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefs.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefs.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/api_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.ApiDefs}
  */
+@com.google.protobuf.Generated
 public final class ApiDefs extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ApiDefs)
@@ -17,8 +18,8 @@ public final class ApiDefs extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ApiDefs.class.getName());
   }
@@ -364,7 +365,7 @@ public Builder mergeFrom(org.tensorflow.proto.ApiDefs other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             opBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getOpFieldBuilder() : null;
+                 internalGetOpFieldBuilder() : null;
           } else {
             opBuilder_.addAllMessages(other.op_);
           }
@@ -606,7 +607,7 @@ public Builder removeOp(int index) {
      */
     public org.tensorflow.proto.ApiDef.Builder getOpBuilder(
         int index) {
-      return getOpFieldBuilder().getBuilder(index);
+      return internalGetOpFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.ApiDef op = 1;
@@ -633,7 +634,7 @@ public org.tensorflow.proto.ApiDefOrBuilder getOpOrBuilder(
      * repeated .tensorflow.ApiDef op = 1;
      */
     public org.tensorflow.proto.ApiDef.Builder addOpBuilder() {
-      return getOpFieldBuilder().addBuilder(
+      return internalGetOpFieldBuilder().addBuilder(
           org.tensorflow.proto.ApiDef.getDefaultInstance());
     }
     /**
@@ -641,7 +642,7 @@ public org.tensorflow.proto.ApiDef.Builder addOpBuilder() {
      */
     public org.tensorflow.proto.ApiDef.Builder addOpBuilder(
         int index) {
-      return getOpFieldBuilder().addBuilder(
+      return internalGetOpFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ApiDef.getDefaultInstance());
     }
     /**
@@ -649,11 +650,11 @@ public org.tensorflow.proto.ApiDef.Builder addOpBuilder(
      */
     public java.util.List 
          getOpBuilderList() {
-      return getOpFieldBuilder().getBuilderList();
+      return internalGetOpFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ApiDef, org.tensorflow.proto.ApiDef.Builder, org.tensorflow.proto.ApiDefOrBuilder> 
-        getOpFieldBuilder() {
+        internalGetOpFieldBuilder() {
       if (opBuilder_ == null) {
         opBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ApiDef, org.tensorflow.proto.ApiDef.Builder, org.tensorflow.proto.ApiDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefsOrBuilder.java
index b8ebc086863..ac86bddb32f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ApiDefsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/api_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ApiDefsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ApiDefs)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AssetFileDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AssetFileDef.java
index db61fe4a55e..55b11c49683 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AssetFileDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AssetFileDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.AssetFileDef}
  */
+@com.google.protobuf.Generated
 public final class AssetFileDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.AssetFileDef)
@@ -22,8 +23,8 @@ public final class AssetFileDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       AssetFileDef.class.getName());
   }
@@ -348,7 +349,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorInfoFieldBuilder();
+        internalGetTensorInfoFieldBuilder();
       }
     }
     @java.lang.Override
@@ -455,7 +456,7 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getTensorInfoFieldBuilder().getBuilder(),
+                  internalGetTensorInfoFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
@@ -601,7 +602,7 @@ public Builder clearTensorInfo() {
     public org.tensorflow.proto.TensorInfo.Builder getTensorInfoBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getTensorInfoFieldBuilder().getBuilder();
+      return internalGetTensorInfoFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -627,7 +628,7 @@ public org.tensorflow.proto.TensorInfoOrBuilder getTensorInfoOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorInfo, org.tensorflow.proto.TensorInfo.Builder, org.tensorflow.proto.TensorInfoOrBuilder> 
-        getTensorInfoFieldBuilder() {
+        internalGetTensorInfoFieldBuilder() {
       if (tensorInfoBuilder_ == null) {
         tensorInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorInfo, org.tensorflow.proto.TensorInfo.Builder, org.tensorflow.proto.TensorInfoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AssetFileDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AssetFileDefOrBuilder.java
index 52a03d57c0e..a3c32ffddce 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AssetFileDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AssetFileDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface AssetFileDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.AssetFileDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValue.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValue.java
index 50282f98466..51eaaa09014 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValue.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValue.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/attr_value.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -14,6 +14,7 @@
  *
  * Protobuf type {@code tensorflow.AttrValue}
  */
+@com.google.protobuf.Generated
 public final class AttrValue extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.AttrValue)
@@ -23,8 +24,8 @@ public final class AttrValue extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       AttrValue.class.getName());
   }
@@ -365,8 +366,8 @@ public static final class ListValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ListValue.class.getName());
     }
@@ -567,8 +568,9 @@ public boolean getB(int index) {
 
     public static final int TYPE_FIELD_NUMBER = 6;
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList type_;
-    private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
+    private com.google.protobuf.Internal.IntList type_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
         org.tensorflow.proto.DataType> type_converter_ =
             new com.google.protobuf.Internal.IntListAdapter.IntConverter<
                 org.tensorflow.proto.DataType>() {
@@ -1172,7 +1174,6 @@ public Builder clear() {
         f_ = emptyFloatList();
         b_ = emptyBooleanList();
         type_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
         if (shapeBuilder_ == null) {
           shape_ = java.util.Collections.emptyList();
         } else {
@@ -1227,11 +1228,6 @@ public org.tensorflow.proto.AttrValue.ListValue buildPartial() {
       }
 
       private void buildPartialRepeatedFields(org.tensorflow.proto.AttrValue.ListValue result) {
-        if (((bitField0_ & 0x00000010) != 0)) {
-          type_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000010);
-        }
-        result.type_ = type_;
         if (shapeBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0)) {
             shape_ = java.util.Collections.unmodifiableList(shape_);
@@ -1279,6 +1275,10 @@ private void buildPartial0(org.tensorflow.proto.AttrValue.ListValue result) {
           b_.makeImmutable();
           result.b_ = b_;
         }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          type_.makeImmutable();
+          result.type_ = type_;
+        }
       }
 
       @java.lang.Override
@@ -1340,7 +1340,8 @@ public Builder mergeFrom(org.tensorflow.proto.AttrValue.ListValue other) {
         if (!other.type_.isEmpty()) {
           if (type_.isEmpty()) {
             type_ = other.type_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            type_.makeImmutable();
+            bitField0_ |= 0x00000010;
           } else {
             ensureTypeIsMutable();
             type_.addAll(other.type_);
@@ -1367,7 +1368,7 @@ public Builder mergeFrom(org.tensorflow.proto.AttrValue.ListValue other) {
               bitField0_ = (bitField0_ & ~0x00000020);
               shapeBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getShapeFieldBuilder() : null;
+                   internalGetShapeFieldBuilder() : null;
             } else {
               shapeBuilder_.addAllMessages(other.shape_);
             }
@@ -1393,7 +1394,7 @@ public Builder mergeFrom(org.tensorflow.proto.AttrValue.ListValue other) {
               bitField0_ = (bitField0_ & ~0x00000040);
               tensorBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getTensorFieldBuilder() : null;
+                   internalGetTensorFieldBuilder() : null;
             } else {
               tensorBuilder_.addAllMessages(other.tensor_);
             }
@@ -1419,7 +1420,7 @@ public Builder mergeFrom(org.tensorflow.proto.AttrValue.ListValue other) {
               bitField0_ = (bitField0_ & ~0x00000080);
               funcBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getFuncFieldBuilder() : null;
+                   internalGetFuncFieldBuilder() : null;
             } else {
               funcBuilder_.addAllMessages(other.func_);
             }
@@ -1515,13 +1516,12 @@ public Builder mergeFrom(
               } // case 48
               case 50: {
                 int length = input.readRawVarint32();
-                int oldLimit = input.pushLimit(length);
-                while(input.getBytesUntilLimit() > 0) {
-                  int tmpRaw = input.readEnum();
-                  ensureTypeIsMutable();
-                  type_.addInt(tmpRaw);
+                int limit = input.pushLimit(length);
+                ensureTypeIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  type_.addInt(input.readEnum());
                 }
-                input.popLimit(oldLimit);
+                input.popLimit(limit);
                 break;
               } // case 50
               case 58: {
@@ -2040,13 +2040,12 @@ public Builder clearB() {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList type_ =
-        emptyIntList();
+      private com.google.protobuf.Internal.IntList type_ = emptyIntList();
       private void ensureTypeIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
+        if (!type_.isModifiable()) {
           type_ = makeMutableCopy(type_);
-          bitField0_ |= 0x00000010;
         }
+        bitField0_ |= 0x00000010;
       }
       /**
        * 
@@ -2095,9 +2094,7 @@ public org.tensorflow.proto.DataType getType(int index) {
        */
       public Builder setType(
           int index, org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureTypeIsMutable();
         type_.setInt(index, value.getNumber());
         onChanged();
@@ -2113,9 +2110,7 @@ public Builder setType(
        * @return This builder for chaining.
        */
       public Builder addType(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureTypeIsMutable();
         type_.addInt(value.getNumber());
         onChanged();
@@ -2163,7 +2158,8 @@ public Builder clearType() {
        */
       public java.util.List
       getTypeValueList() {
-        return java.util.Collections.unmodifiableList(type_);
+        type_.makeImmutable();
+        return type_;
       }
       /**
        * 
@@ -2460,7 +2456,7 @@ public Builder removeShape(int index) {
        */
       public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder(
           int index) {
-        return getShapeFieldBuilder().getBuilder(index);
+        return internalGetShapeFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -2499,7 +2495,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder(
        * repeated .tensorflow.TensorShapeProto shape = 7;
        */
       public org.tensorflow.proto.TensorShapeProto.Builder addShapeBuilder() {
-        return getShapeFieldBuilder().addBuilder(
+        return internalGetShapeFieldBuilder().addBuilder(
             org.tensorflow.proto.TensorShapeProto.getDefaultInstance());
       }
       /**
@@ -2511,7 +2507,7 @@ public org.tensorflow.proto.TensorShapeProto.Builder addShapeBuilder() {
        */
       public org.tensorflow.proto.TensorShapeProto.Builder addShapeBuilder(
           int index) {
-        return getShapeFieldBuilder().addBuilder(
+        return internalGetShapeFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TensorShapeProto.getDefaultInstance());
       }
       /**
@@ -2523,11 +2519,11 @@ public org.tensorflow.proto.TensorShapeProto.Builder addShapeBuilder(
        */
       public java.util.List 
            getShapeBuilderList() {
-        return getShapeFieldBuilder().getBuilderList();
+        return internalGetShapeFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getShapeFieldBuilder() {
+          internalGetShapeFieldBuilder() {
         if (shapeBuilder_ == null) {
           shapeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -2772,7 +2768,7 @@ public Builder removeTensor(int index) {
        */
       public org.tensorflow.proto.TensorProto.Builder getTensorBuilder(
           int index) {
-        return getTensorFieldBuilder().getBuilder(index);
+        return internalGetTensorFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -2811,7 +2807,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorOrBuilder(
        * repeated .tensorflow.TensorProto tensor = 8;
        */
       public org.tensorflow.proto.TensorProto.Builder addTensorBuilder() {
-        return getTensorFieldBuilder().addBuilder(
+        return internalGetTensorFieldBuilder().addBuilder(
             org.tensorflow.proto.TensorProto.getDefaultInstance());
       }
       /**
@@ -2823,7 +2819,7 @@ public org.tensorflow.proto.TensorProto.Builder addTensorBuilder() {
        */
       public org.tensorflow.proto.TensorProto.Builder addTensorBuilder(
           int index) {
-        return getTensorFieldBuilder().addBuilder(
+        return internalGetTensorFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TensorProto.getDefaultInstance());
       }
       /**
@@ -2835,11 +2831,11 @@ public org.tensorflow.proto.TensorProto.Builder addTensorBuilder(
        */
       public java.util.List 
            getTensorBuilderList() {
-        return getTensorFieldBuilder().getBuilderList();
+        return internalGetTensorFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-          getTensorFieldBuilder() {
+          internalGetTensorFieldBuilder() {
         if (tensorBuilder_ == null) {
           tensorBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
@@ -3084,7 +3080,7 @@ public Builder removeFunc(int index) {
        */
       public org.tensorflow.proto.NameAttrList.Builder getFuncBuilder(
           int index) {
-        return getFuncFieldBuilder().getBuilder(index);
+        return internalGetFuncFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -3123,7 +3119,7 @@ public org.tensorflow.proto.NameAttrListOrBuilder getFuncOrBuilder(
        * repeated .tensorflow.NameAttrList func = 9;
        */
       public org.tensorflow.proto.NameAttrList.Builder addFuncBuilder() {
-        return getFuncFieldBuilder().addBuilder(
+        return internalGetFuncFieldBuilder().addBuilder(
             org.tensorflow.proto.NameAttrList.getDefaultInstance());
       }
       /**
@@ -3135,7 +3131,7 @@ public org.tensorflow.proto.NameAttrList.Builder addFuncBuilder() {
        */
       public org.tensorflow.proto.NameAttrList.Builder addFuncBuilder(
           int index) {
-        return getFuncFieldBuilder().addBuilder(
+        return internalGetFuncFieldBuilder().addBuilder(
             index, org.tensorflow.proto.NameAttrList.getDefaultInstance());
       }
       /**
@@ -3147,11 +3143,11 @@ public org.tensorflow.proto.NameAttrList.Builder addFuncBuilder(
        */
       public java.util.List 
            getFuncBuilderList() {
-        return getFuncFieldBuilder().getBuilderList();
+        return internalGetFuncFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.NameAttrList, org.tensorflow.proto.NameAttrList.Builder, org.tensorflow.proto.NameAttrListOrBuilder> 
-          getFuncFieldBuilder() {
+          internalGetFuncFieldBuilder() {
         if (funcBuilder_ == null) {
           funcBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.NameAttrList, org.tensorflow.proto.NameAttrList.Builder, org.tensorflow.proto.NameAttrListOrBuilder>(
@@ -4209,7 +4205,7 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getListFieldBuilder().getBuilder(),
+                  internalGetListFieldBuilder().getBuilder(),
                   extensionRegistry);
               valueCase_ = 1;
               break;
@@ -4242,14 +4238,14 @@ public Builder mergeFrom(
             } // case 48
             case 58: {
               input.readMessage(
-                  getShapeFieldBuilder().getBuilder(),
+                  internalGetShapeFieldBuilder().getBuilder(),
                   extensionRegistry);
               valueCase_ = 7;
               break;
             } // case 58
             case 66: {
               input.readMessage(
-                  getTensorFieldBuilder().getBuilder(),
+                  internalGetTensorFieldBuilder().getBuilder(),
                   extensionRegistry);
               valueCase_ = 8;
               break;
@@ -4262,7 +4258,7 @@ public Builder mergeFrom(
             } // case 74
             case 82: {
               input.readMessage(
-                  getFuncFieldBuilder().getBuilder(),
+                  internalGetFuncFieldBuilder().getBuilder(),
                   extensionRegistry);
               valueCase_ = 10;
               break;
@@ -4600,9 +4596,7 @@ public org.tensorflow.proto.DataType getType() {
      * @return This builder for chaining.
      */
     public Builder setType(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       valueCase_ = 6;
       value_ = value.getNumber();
       onChanged();
@@ -4757,7 +4751,7 @@ public Builder clearShape() {
      * .tensorflow.TensorShapeProto shape = 7;
      */
     public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
-      return getShapeFieldBuilder().getBuilder();
+      return internalGetShapeFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -4786,7 +4780,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-        getShapeFieldBuilder() {
+        internalGetShapeFieldBuilder() {
       if (shapeBuilder_ == null) {
         if (!(valueCase_ == 7)) {
           value_ = org.tensorflow.proto.TensorShapeProto.getDefaultInstance();
@@ -4935,7 +4929,7 @@ public Builder clearTensor() {
      * .tensorflow.TensorProto tensor = 8;
      */
     public org.tensorflow.proto.TensorProto.Builder getTensorBuilder() {
-      return getTensorFieldBuilder().getBuilder();
+      return internalGetTensorFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -4964,7 +4958,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-        getTensorFieldBuilder() {
+        internalGetTensorFieldBuilder() {
       if (tensorBuilder_ == null) {
         if (!(valueCase_ == 8)) {
           value_ = org.tensorflow.proto.TensorProto.getDefaultInstance();
@@ -5113,7 +5107,7 @@ public Builder clearList() {
      * .tensorflow.AttrValue.ListValue list = 1;
      */
     public org.tensorflow.proto.AttrValue.ListValue.Builder getListBuilder() {
-      return getListFieldBuilder().getBuilder();
+      return internalGetListFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -5142,7 +5136,7 @@ public org.tensorflow.proto.AttrValue.ListValueOrBuilder getListOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.AttrValue.ListValue, org.tensorflow.proto.AttrValue.ListValue.Builder, org.tensorflow.proto.AttrValue.ListValueOrBuilder> 
-        getListFieldBuilder() {
+        internalGetListFieldBuilder() {
       if (listBuilder_ == null) {
         if (!(valueCase_ == 1)) {
           value_ = org.tensorflow.proto.AttrValue.ListValue.getDefaultInstance();
@@ -5312,7 +5306,7 @@ public Builder clearFunc() {
      * .tensorflow.NameAttrList func = 10;
      */
     public org.tensorflow.proto.NameAttrList.Builder getFuncBuilder() {
-      return getFuncFieldBuilder().getBuilder();
+      return internalGetFuncFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -5347,7 +5341,7 @@ public org.tensorflow.proto.NameAttrListOrBuilder getFuncOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.NameAttrList, org.tensorflow.proto.NameAttrList.Builder, org.tensorflow.proto.NameAttrListOrBuilder> 
-        getFuncFieldBuilder() {
+        internalGetFuncFieldBuilder() {
       if (funcBuilder_ == null) {
         if (!(valueCase_ == 10)) {
           value_ = org.tensorflow.proto.NameAttrList.getDefaultInstance();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValueOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValueOrBuilder.java
index 88837631bad..3c90ef57151 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValueOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValueOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/attr_value.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface AttrValueOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.AttrValue)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValueProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValueProtos.java
index e37ba3edf83..c79adb43149 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValueProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AttrValueProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/attr_value.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class AttrValueProtos {
   private AttrValueProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       AttrValueProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AutoParallelOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AutoParallelOptions.java
index 9c98cce7b81..8f3f9321fd5 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AutoParallelOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AutoParallelOptions.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/rewriter_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.AutoParallelOptions}
  */
+@com.google.protobuf.Generated
 public final class AutoParallelOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.AutoParallelOptions)
@@ -17,8 +18,8 @@ public final class AutoParallelOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       AutoParallelOptions.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AutoParallelOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AutoParallelOptionsOrBuilder.java
index 2220bc1d192..5b77cc22916 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AutoParallelOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AutoParallelOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/rewriter_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface AutoParallelOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.AutoParallelOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AvailableDeviceInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AvailableDeviceInfo.java
index 174ab3c3307..19d8a8dc32c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AvailableDeviceInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AvailableDeviceInfo.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.AvailableDeviceInfo}
  */
+@com.google.protobuf.Generated
 public final class AvailableDeviceInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.AvailableDeviceInfo)
@@ -21,8 +22,8 @@ public final class AvailableDeviceInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       AvailableDeviceInfo.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AvailableDeviceInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AvailableDeviceInfoOrBuilder.java
index de445a4283f..6ed96b1d0dc 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AvailableDeviceInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/AvailableDeviceInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface AvailableDeviceInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.AvailableDeviceInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BatchingOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BatchingOptions.java
index fb63a3ec488..ea4f716db19 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BatchingOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BatchingOptions.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.BatchingOptions}
  */
+@com.google.protobuf.Generated
 public final class BatchingOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.BatchingOptions)
@@ -17,8 +18,8 @@ public final class BatchingOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BatchingOptions.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BatchingOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BatchingOptionsOrBuilder.java
index f23c6d205d3..13afd39f0f7 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BatchingOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BatchingOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface BatchingOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.BatchingOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntries.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntries.java
index 78647b68d29..768bed79b75 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntries.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntries.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.BenchmarkEntries}
  */
+@com.google.protobuf.Generated
 public final class BenchmarkEntries extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.BenchmarkEntries)
@@ -17,8 +18,8 @@ public final class BenchmarkEntries extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BenchmarkEntries.class.getName());
   }
@@ -364,7 +365,7 @@ public Builder mergeFrom(org.tensorflow.proto.BenchmarkEntries other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             entryBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getEntryFieldBuilder() : null;
+                 internalGetEntryFieldBuilder() : null;
           } else {
             entryBuilder_.addAllMessages(other.entry_);
           }
@@ -606,7 +607,7 @@ public Builder removeEntry(int index) {
      */
     public org.tensorflow.proto.BenchmarkEntry.Builder getEntryBuilder(
         int index) {
-      return getEntryFieldBuilder().getBuilder(index);
+      return internalGetEntryFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.BenchmarkEntry entry = 1;
@@ -633,7 +634,7 @@ public org.tensorflow.proto.BenchmarkEntryOrBuilder getEntryOrBuilder(
      * repeated .tensorflow.BenchmarkEntry entry = 1;
      */
     public org.tensorflow.proto.BenchmarkEntry.Builder addEntryBuilder() {
-      return getEntryFieldBuilder().addBuilder(
+      return internalGetEntryFieldBuilder().addBuilder(
           org.tensorflow.proto.BenchmarkEntry.getDefaultInstance());
     }
     /**
@@ -641,7 +642,7 @@ public org.tensorflow.proto.BenchmarkEntry.Builder addEntryBuilder() {
      */
     public org.tensorflow.proto.BenchmarkEntry.Builder addEntryBuilder(
         int index) {
-      return getEntryFieldBuilder().addBuilder(
+      return internalGetEntryFieldBuilder().addBuilder(
           index, org.tensorflow.proto.BenchmarkEntry.getDefaultInstance());
     }
     /**
@@ -649,11 +650,11 @@ public org.tensorflow.proto.BenchmarkEntry.Builder addEntryBuilder(
      */
     public java.util.List 
          getEntryBuilderList() {
-      return getEntryFieldBuilder().getBuilderList();
+      return internalGetEntryFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.BenchmarkEntry, org.tensorflow.proto.BenchmarkEntry.Builder, org.tensorflow.proto.BenchmarkEntryOrBuilder> 
-        getEntryFieldBuilder() {
+        internalGetEntryFieldBuilder() {
       if (entryBuilder_ == null) {
         entryBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.BenchmarkEntry, org.tensorflow.proto.BenchmarkEntry.Builder, org.tensorflow.proto.BenchmarkEntryOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntriesOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntriesOrBuilder.java
index 7f439a05b87..a505ffd5527 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntriesOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntriesOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface BenchmarkEntriesOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.BenchmarkEntries)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntry.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntry.java
index 7b41d4e7a15..4da85f64984 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntry.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntry.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -18,6 +18,7 @@
  *
  * Protobuf type {@code tensorflow.BenchmarkEntry}
  */
+@com.google.protobuf.Generated
 public final class BenchmarkEntry extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.BenchmarkEntry)
@@ -27,8 +28,8 @@ public final class BenchmarkEntry extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BenchmarkEntry.class.getName());
   }
@@ -743,13 +744,13 @@ public Builder mergeFrom(org.tensorflow.proto.BenchmarkEntry other) {
       if (other.getIters() != 0L) {
         setIters(other.getIters());
       }
-      if (other.getCpuTime() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getCpuTime()) != 0) {
         setCpuTime(other.getCpuTime());
       }
-      if (other.getWallTime() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getWallTime()) != 0) {
         setWallTime(other.getWallTime());
       }
-      if (other.getThroughput() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getThroughput()) != 0) {
         setThroughput(other.getThroughput());
       }
       internalGetMutableExtras().mergeFrom(
@@ -775,7 +776,7 @@ public Builder mergeFrom(org.tensorflow.proto.BenchmarkEntry other) {
             bitField0_ = (bitField0_ & ~0x00000040);
             metricsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getMetricsFieldBuilder() : null;
+                 internalGetMetricsFieldBuilder() : null;
           } else {
             metricsBuilder_.addAllMessages(other.metrics_);
           }
@@ -1576,7 +1577,7 @@ public Builder removeMetrics(int index) {
      */
     public org.tensorflow.proto.MetricEntry.Builder getMetricsBuilder(
         int index) {
-      return getMetricsFieldBuilder().getBuilder(index);
+      return internalGetMetricsFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1618,7 +1619,7 @@ public org.tensorflow.proto.MetricEntryOrBuilder getMetricsOrBuilder(
      * repeated .tensorflow.MetricEntry metrics = 7;
      */
     public org.tensorflow.proto.MetricEntry.Builder addMetricsBuilder() {
-      return getMetricsFieldBuilder().addBuilder(
+      return internalGetMetricsFieldBuilder().addBuilder(
           org.tensorflow.proto.MetricEntry.getDefaultInstance());
     }
     /**
@@ -1631,7 +1632,7 @@ public org.tensorflow.proto.MetricEntry.Builder addMetricsBuilder() {
      */
     public org.tensorflow.proto.MetricEntry.Builder addMetricsBuilder(
         int index) {
-      return getMetricsFieldBuilder().addBuilder(
+      return internalGetMetricsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.MetricEntry.getDefaultInstance());
     }
     /**
@@ -1644,11 +1645,11 @@ public org.tensorflow.proto.MetricEntry.Builder addMetricsBuilder(
      */
     public java.util.List 
          getMetricsBuilderList() {
-      return getMetricsFieldBuilder().getBuilderList();
+      return internalGetMetricsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.MetricEntry, org.tensorflow.proto.MetricEntry.Builder, org.tensorflow.proto.MetricEntryOrBuilder> 
-        getMetricsFieldBuilder() {
+        internalGetMetricsFieldBuilder() {
       if (metricsBuilder_ == null) {
         metricsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.MetricEntry, org.tensorflow.proto.MetricEntry.Builder, org.tensorflow.proto.MetricEntryOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntryOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntryOrBuilder.java
index 9e699bd4b76..2ac3cd182d3 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntryOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BenchmarkEntryOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface BenchmarkEntryOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.BenchmarkEntry)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BfcMemoryMap.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BfcMemoryMap.java
index d84aebde9c7..97c575c1ac5 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BfcMemoryMap.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BfcMemoryMap.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/bfc_memory_map.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class BfcMemoryMap {
   private BfcMemoryMap() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BfcMemoryMap.class.getName());
   }
@@ -75,8 +76,8 @@ public static final class MemAllocatorStats extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MemAllocatorStats.class.getName());
     }
@@ -479,7 +480,7 @@ public Builder mergeFrom(org.tensorflow.proto.BfcMemoryMap.MemAllocatorStats oth
         if (other.getLargestAllocSize() != 0L) {
           setLargestAllocSize(other.getLargestAllocSize());
         }
-        if (other.getFragmentationMetric() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getFragmentationMetric()) != 0) {
           setFragmentationMetric(other.getFragmentationMetric());
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -837,8 +838,8 @@ public static final class MemChunk extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MemChunk.class.getName());
     }
@@ -1900,8 +1901,8 @@ public static final class BinSummary extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         BinSummary.class.getName());
     }
@@ -2608,8 +2609,8 @@ public static final class SnapShot extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SnapShot.class.getName());
     }
@@ -3203,8 +3204,8 @@ public static final class MemoryDump extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MemoryDump.class.getName());
     }
@@ -3665,10 +3666,10 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getBinSummaryFieldBuilder();
-          getChunkFieldBuilder();
-          getSnapShotFieldBuilder();
-          getStatsFieldBuilder();
+          internalGetBinSummaryFieldBuilder();
+          internalGetChunkFieldBuilder();
+          internalGetSnapShotFieldBuilder();
+          internalGetStatsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -3816,7 +3817,7 @@ public Builder mergeFrom(org.tensorflow.proto.BfcMemoryMap.MemoryDump other) {
               bitField0_ = (bitField0_ & ~0x00000002);
               binSummaryBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getBinSummaryFieldBuilder() : null;
+                   internalGetBinSummaryFieldBuilder() : null;
             } else {
               binSummaryBuilder_.addAllMessages(other.binSummary_);
             }
@@ -3842,7 +3843,7 @@ public Builder mergeFrom(org.tensorflow.proto.BfcMemoryMap.MemoryDump other) {
               bitField0_ = (bitField0_ & ~0x00000004);
               chunkBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getChunkFieldBuilder() : null;
+                   internalGetChunkFieldBuilder() : null;
             } else {
               chunkBuilder_.addAllMessages(other.chunk_);
             }
@@ -3868,7 +3869,7 @@ public Builder mergeFrom(org.tensorflow.proto.BfcMemoryMap.MemoryDump other) {
               bitField0_ = (bitField0_ & ~0x00000008);
               snapShotBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getSnapShotFieldBuilder() : null;
+                   internalGetSnapShotFieldBuilder() : null;
             } else {
               snapShotBuilder_.addAllMessages(other.snapShot_);
             }
@@ -3949,7 +3950,7 @@ public Builder mergeFrom(
               } // case 34
               case 42: {
                 input.readMessage(
-                    getStatsFieldBuilder().getBuilder(),
+                    internalGetStatsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000010;
                 break;
@@ -4223,7 +4224,7 @@ public Builder removeBinSummary(int index) {
        */
       public org.tensorflow.proto.BfcMemoryMap.BinSummary.Builder getBinSummaryBuilder(
           int index) {
-        return getBinSummaryFieldBuilder().getBuilder(index);
+        return internalGetBinSummaryFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.BinSummary bin_summary = 2;
@@ -4250,7 +4251,7 @@ public org.tensorflow.proto.BfcMemoryMap.BinSummaryOrBuilder getBinSummaryOrBuil
        * repeated .tensorflow.BinSummary bin_summary = 2;
        */
       public org.tensorflow.proto.BfcMemoryMap.BinSummary.Builder addBinSummaryBuilder() {
-        return getBinSummaryFieldBuilder().addBuilder(
+        return internalGetBinSummaryFieldBuilder().addBuilder(
             org.tensorflow.proto.BfcMemoryMap.BinSummary.getDefaultInstance());
       }
       /**
@@ -4258,7 +4259,7 @@ public org.tensorflow.proto.BfcMemoryMap.BinSummary.Builder addBinSummaryBuilder
        */
       public org.tensorflow.proto.BfcMemoryMap.BinSummary.Builder addBinSummaryBuilder(
           int index) {
-        return getBinSummaryFieldBuilder().addBuilder(
+        return internalGetBinSummaryFieldBuilder().addBuilder(
             index, org.tensorflow.proto.BfcMemoryMap.BinSummary.getDefaultInstance());
       }
       /**
@@ -4266,11 +4267,11 @@ public org.tensorflow.proto.BfcMemoryMap.BinSummary.Builder addBinSummaryBuilder
        */
       public java.util.List 
            getBinSummaryBuilderList() {
-        return getBinSummaryFieldBuilder().getBuilderList();
+        return internalGetBinSummaryFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.BfcMemoryMap.BinSummary, org.tensorflow.proto.BfcMemoryMap.BinSummary.Builder, org.tensorflow.proto.BfcMemoryMap.BinSummaryOrBuilder> 
-          getBinSummaryFieldBuilder() {
+          internalGetBinSummaryFieldBuilder() {
         if (binSummaryBuilder_ == null) {
           binSummaryBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.BfcMemoryMap.BinSummary, org.tensorflow.proto.BfcMemoryMap.BinSummary.Builder, org.tensorflow.proto.BfcMemoryMap.BinSummaryOrBuilder>(
@@ -4463,7 +4464,7 @@ public Builder removeChunk(int index) {
        */
       public org.tensorflow.proto.BfcMemoryMap.MemChunk.Builder getChunkBuilder(
           int index) {
-        return getChunkFieldBuilder().getBuilder(index);
+        return internalGetChunkFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.MemChunk chunk = 3;
@@ -4490,7 +4491,7 @@ public org.tensorflow.proto.BfcMemoryMap.MemChunkOrBuilder getChunkOrBuilder(
        * repeated .tensorflow.MemChunk chunk = 3;
        */
       public org.tensorflow.proto.BfcMemoryMap.MemChunk.Builder addChunkBuilder() {
-        return getChunkFieldBuilder().addBuilder(
+        return internalGetChunkFieldBuilder().addBuilder(
             org.tensorflow.proto.BfcMemoryMap.MemChunk.getDefaultInstance());
       }
       /**
@@ -4498,7 +4499,7 @@ public org.tensorflow.proto.BfcMemoryMap.MemChunk.Builder addChunkBuilder() {
        */
       public org.tensorflow.proto.BfcMemoryMap.MemChunk.Builder addChunkBuilder(
           int index) {
-        return getChunkFieldBuilder().addBuilder(
+        return internalGetChunkFieldBuilder().addBuilder(
             index, org.tensorflow.proto.BfcMemoryMap.MemChunk.getDefaultInstance());
       }
       /**
@@ -4506,11 +4507,11 @@ public org.tensorflow.proto.BfcMemoryMap.MemChunk.Builder addChunkBuilder(
        */
       public java.util.List 
            getChunkBuilderList() {
-        return getChunkFieldBuilder().getBuilderList();
+        return internalGetChunkFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.BfcMemoryMap.MemChunk, org.tensorflow.proto.BfcMemoryMap.MemChunk.Builder, org.tensorflow.proto.BfcMemoryMap.MemChunkOrBuilder> 
-          getChunkFieldBuilder() {
+          internalGetChunkFieldBuilder() {
         if (chunkBuilder_ == null) {
           chunkBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.BfcMemoryMap.MemChunk, org.tensorflow.proto.BfcMemoryMap.MemChunk.Builder, org.tensorflow.proto.BfcMemoryMap.MemChunkOrBuilder>(
@@ -4703,7 +4704,7 @@ public Builder removeSnapShot(int index) {
        */
       public org.tensorflow.proto.BfcMemoryMap.SnapShot.Builder getSnapShotBuilder(
           int index) {
-        return getSnapShotFieldBuilder().getBuilder(index);
+        return internalGetSnapShotFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.SnapShot snap_shot = 4;
@@ -4730,7 +4731,7 @@ public org.tensorflow.proto.BfcMemoryMap.SnapShotOrBuilder getSnapShotOrBuilder(
        * repeated .tensorflow.SnapShot snap_shot = 4;
        */
       public org.tensorflow.proto.BfcMemoryMap.SnapShot.Builder addSnapShotBuilder() {
-        return getSnapShotFieldBuilder().addBuilder(
+        return internalGetSnapShotFieldBuilder().addBuilder(
             org.tensorflow.proto.BfcMemoryMap.SnapShot.getDefaultInstance());
       }
       /**
@@ -4738,7 +4739,7 @@ public org.tensorflow.proto.BfcMemoryMap.SnapShot.Builder addSnapShotBuilder() {
        */
       public org.tensorflow.proto.BfcMemoryMap.SnapShot.Builder addSnapShotBuilder(
           int index) {
-        return getSnapShotFieldBuilder().addBuilder(
+        return internalGetSnapShotFieldBuilder().addBuilder(
             index, org.tensorflow.proto.BfcMemoryMap.SnapShot.getDefaultInstance());
       }
       /**
@@ -4746,11 +4747,11 @@ public org.tensorflow.proto.BfcMemoryMap.SnapShot.Builder addSnapShotBuilder(
        */
       public java.util.List 
            getSnapShotBuilderList() {
-        return getSnapShotFieldBuilder().getBuilderList();
+        return internalGetSnapShotFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.BfcMemoryMap.SnapShot, org.tensorflow.proto.BfcMemoryMap.SnapShot.Builder, org.tensorflow.proto.BfcMemoryMap.SnapShotOrBuilder> 
-          getSnapShotFieldBuilder() {
+          internalGetSnapShotFieldBuilder() {
         if (snapShotBuilder_ == null) {
           snapShotBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.BfcMemoryMap.SnapShot, org.tensorflow.proto.BfcMemoryMap.SnapShot.Builder, org.tensorflow.proto.BfcMemoryMap.SnapShotOrBuilder>(
@@ -4854,7 +4855,7 @@ public Builder clearStats() {
       public org.tensorflow.proto.BfcMemoryMap.MemAllocatorStats.Builder getStatsBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
-        return getStatsFieldBuilder().getBuilder();
+        return internalGetStatsFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.MemAllocatorStats stats = 5;
@@ -4872,7 +4873,7 @@ public org.tensorflow.proto.BfcMemoryMap.MemAllocatorStatsOrBuilder getStatsOrBu
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.BfcMemoryMap.MemAllocatorStats, org.tensorflow.proto.BfcMemoryMap.MemAllocatorStats.Builder, org.tensorflow.proto.BfcMemoryMap.MemAllocatorStatsOrBuilder> 
-          getStatsFieldBuilder() {
+          internalGetStatsFieldBuilder() {
         if (statsBuilder_ == null) {
           statsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.BfcMemoryMap.MemAllocatorStats, org.tensorflow.proto.BfcMemoryMap.MemAllocatorStats.Builder, org.tensorflow.proto.BfcMemoryMap.MemAllocatorStatsOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BuildConfiguration.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BuildConfiguration.java
index 5924c47cbc4..24d76a8e774 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BuildConfiguration.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BuildConfiguration.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.BuildConfiguration}
  */
+@com.google.protobuf.Generated
 public final class BuildConfiguration extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.BuildConfiguration)
@@ -17,8 +18,8 @@ public final class BuildConfiguration extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BuildConfiguration.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BuildConfigurationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BuildConfigurationOrBuilder.java
index 4e529158905..0a0d7b2ab3b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BuildConfigurationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BuildConfigurationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface BuildConfigurationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.BuildConfiguration)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleEntryProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleEntryProto.java
index 778eb17b5d2..68292027a91 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleEntryProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleEntryProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/tensor_bundle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.BundleEntryProto}
  */
+@com.google.protobuf.Generated
 public final class BundleEntryProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.BundleEntryProto)
@@ -21,8 +22,8 @@ public final class BundleEntryProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BundleEntryProto.class.getName());
   }
@@ -513,8 +514,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getShapeFieldBuilder();
-        getSlicesFieldBuilder();
+        internalGetShapeFieldBuilder();
+        internalGetSlicesFieldBuilder();
       }
     }
     @java.lang.Override
@@ -659,7 +660,7 @@ public Builder mergeFrom(org.tensorflow.proto.BundleEntryProto other) {
             bitField0_ = (bitField0_ & ~0x00000040);
             slicesBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getSlicesFieldBuilder() : null;
+                 internalGetSlicesFieldBuilder() : null;
           } else {
             slicesBuilder_.addAllMessages(other.slices_);
           }
@@ -698,7 +699,7 @@ public Builder mergeFrom(
             } // case 8
             case 18: {
               input.readMessage(
-                  getShapeFieldBuilder().getBuilder(),
+                  internalGetShapeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -803,9 +804,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       dtype_ = value.getNumber();
       onChanged();
@@ -917,7 +916,7 @@ public Builder clearShape() {
     public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getShapeFieldBuilder().getBuilder();
+      return internalGetShapeFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.TensorShapeProto shape = 2;
@@ -935,7 +934,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-        getShapeFieldBuilder() {
+        internalGetShapeFieldBuilder() {
       if (shapeBuilder_ == null) {
         shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -1412,7 +1411,7 @@ public Builder removeSlices(int index) {
      */
     public org.tensorflow.proto.TensorSliceProto.Builder getSlicesBuilder(
         int index) {
-      return getSlicesFieldBuilder().getBuilder(index);
+      return internalGetSlicesFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1469,7 +1468,7 @@ public org.tensorflow.proto.TensorSliceProtoOrBuilder getSlicesOrBuilder(
      * repeated .tensorflow.TensorSliceProto slices = 7;
      */
     public org.tensorflow.proto.TensorSliceProto.Builder addSlicesBuilder() {
-      return getSlicesFieldBuilder().addBuilder(
+      return internalGetSlicesFieldBuilder().addBuilder(
           org.tensorflow.proto.TensorSliceProto.getDefaultInstance());
     }
     /**
@@ -1487,7 +1486,7 @@ public org.tensorflow.proto.TensorSliceProto.Builder addSlicesBuilder() {
      */
     public org.tensorflow.proto.TensorSliceProto.Builder addSlicesBuilder(
         int index) {
-      return getSlicesFieldBuilder().addBuilder(
+      return internalGetSlicesFieldBuilder().addBuilder(
           index, org.tensorflow.proto.TensorSliceProto.getDefaultInstance());
     }
     /**
@@ -1505,11 +1504,11 @@ public org.tensorflow.proto.TensorSliceProto.Builder addSlicesBuilder(
      */
     public java.util.List 
          getSlicesBuilderList() {
-      return getSlicesFieldBuilder().getBuilderList();
+      return internalGetSlicesFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.TensorSliceProto, org.tensorflow.proto.TensorSliceProto.Builder, org.tensorflow.proto.TensorSliceProtoOrBuilder> 
-        getSlicesFieldBuilder() {
+        internalGetSlicesFieldBuilder() {
       if (slicesBuilder_ == null) {
         slicesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TensorSliceProto, org.tensorflow.proto.TensorSliceProto.Builder, org.tensorflow.proto.TensorSliceProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleEntryProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleEntryProtoOrBuilder.java
index cc082e079da..a9eed07e791 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleEntryProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleEntryProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/tensor_bundle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface BundleEntryProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.BundleEntryProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleHeaderProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleHeaderProto.java
index b3794d41c2e..ad3391c8a65 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleHeaderProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleHeaderProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/tensor_bundle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -18,6 +18,7 @@
  *
  * Protobuf type {@code tensorflow.BundleHeaderProto}
  */
+@com.google.protobuf.Generated
 public final class BundleHeaderProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.BundleHeaderProto)
@@ -27,8 +28,8 @@ public final class BundleHeaderProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BundleHeaderProto.class.getName());
   }
@@ -81,8 +82,8 @@ public enum Endianness
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Endianness.class.getName());
     }
@@ -150,7 +151,7 @@ public Endianness findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.BundleHeaderProto.getDescriptor().getEnumTypes().get(0);
     }
@@ -476,7 +477,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getVersionFieldBuilder();
+        internalGetVersionFieldBuilder();
       }
     }
     @java.lang.Override
@@ -598,7 +599,7 @@ public Builder mergeFrom(
             } // case 16
             case 26: {
               input.readMessage(
-                  getVersionFieldBuilder().getBuilder(),
+                  internalGetVersionFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
@@ -698,9 +699,7 @@ public org.tensorflow.proto.BundleHeaderProto.Endianness getEndianness() {
      * @return This builder for chaining.
      */
     public Builder setEndianness(org.tensorflow.proto.BundleHeaderProto.Endianness value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000002;
       endianness_ = value.getNumber();
       onChanged();
@@ -836,7 +835,7 @@ public Builder clearVersion() {
     public org.tensorflow.proto.VersionDef.Builder getVersionBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getVersionFieldBuilder().getBuilder();
+      return internalGetVersionFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -862,7 +861,7 @@ public org.tensorflow.proto.VersionDefOrBuilder getVersionOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder> 
-        getVersionFieldBuilder() {
+        internalGetVersionFieldBuilder() {
       if (versionBuilder_ == null) {
         versionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleHeaderProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleHeaderProtoOrBuilder.java
index af4013c645d..e487eb9771a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleHeaderProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BundleHeaderProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/tensor_bundle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface BundleHeaderProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.BundleHeaderProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BytesList.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BytesList.java
index 2f6bc835be9..37d78b62b2d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BytesList.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BytesList.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.BytesList}
  */
+@com.google.protobuf.Generated
 public final class BytesList extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.BytesList)
@@ -22,8 +23,8 @@ public final class BytesList extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BytesList.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BytesListOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BytesListOrBuilder.java
index aedd4074e8e..163d0486fc6 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BytesListOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/BytesListOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface BytesListOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.BytesList)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CPUInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CPUInfo.java
index 035624d0f53..9541e623a08 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CPUInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CPUInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.CPUInfo}
  */
+@com.google.protobuf.Generated
 public final class CPUInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.CPUInfo)
@@ -17,8 +18,8 @@ public final class CPUInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CPUInfo.class.getName());
   }
@@ -643,7 +644,7 @@ public Builder mergeFrom(org.tensorflow.proto.CPUInfo other) {
       if (other.getNumCoresAllowed() != 0L) {
         setNumCoresAllowed(other.getNumCoresAllowed());
       }
-      if (other.getMhzPerCpu() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getMhzPerCpu()) != 0) {
         setMhzPerCpu(other.getMhzPerCpu());
       }
       if (!other.getCpuInfo().isEmpty()) {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CPUInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CPUInfoOrBuilder.java
index 7989860564f..23465ab8b77 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CPUInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CPUInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface CPUInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.CPUInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CallableOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CallableOptions.java
index 5e11341845b..d05ecd2cc20 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CallableOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CallableOptions.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -15,6 +15,7 @@
  *
  * Protobuf type {@code tensorflow.CallableOptions}
  */
+@com.google.protobuf.Generated
 public final class CallableOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.CallableOptions)
@@ -24,8 +25,8 @@ public final class CallableOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CallableOptions.class.getName());
   }
@@ -1081,8 +1082,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getRunOptionsFieldBuilder();
-        getTensorConnectionFieldBuilder();
+        internalGetRunOptionsFieldBuilder();
+        internalGetTensorConnectionFieldBuilder();
       }
     }
     @java.lang.Override
@@ -1254,7 +1255,7 @@ public Builder mergeFrom(org.tensorflow.proto.CallableOptions other) {
             bitField0_ = (bitField0_ & ~0x00000010);
             tensorConnectionBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getTensorConnectionFieldBuilder() : null;
+                 internalGetTensorConnectionFieldBuilder() : null;
           } else {
             tensorConnectionBuilder_.addAllMessages(other.tensorConnection_);
           }
@@ -1315,7 +1316,7 @@ public Builder mergeFrom(
             } // case 26
             case 34: {
               input.readMessage(
-                  getRunOptionsFieldBuilder().getBuilder(),
+                  internalGetRunOptionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000008;
               break;
@@ -1960,7 +1961,7 @@ public Builder clearRunOptions() {
     public org.tensorflow.proto.RunOptions.Builder getRunOptionsBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
-      return getRunOptionsFieldBuilder().getBuilder();
+      return internalGetRunOptionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1986,7 +1987,7 @@ public org.tensorflow.proto.RunOptionsOrBuilder getRunOptionsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.RunOptions, org.tensorflow.proto.RunOptions.Builder, org.tensorflow.proto.RunOptionsOrBuilder> 
-        getRunOptionsFieldBuilder() {
+        internalGetRunOptionsFieldBuilder() {
       if (runOptionsBuilder_ == null) {
         runOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.RunOptions, org.tensorflow.proto.RunOptions.Builder, org.tensorflow.proto.RunOptionsOrBuilder>(
@@ -2256,7 +2257,7 @@ public Builder removeTensorConnection(int index) {
      */
     public org.tensorflow.proto.TensorConnection.Builder getTensorConnectionBuilder(
         int index) {
-      return getTensorConnectionFieldBuilder().getBuilder(index);
+      return internalGetTensorConnectionFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -2301,7 +2302,7 @@ public org.tensorflow.proto.TensorConnectionOrBuilder getTensorConnectionOrBuild
      * repeated .tensorflow.TensorConnection tensor_connection = 5;
      */
     public org.tensorflow.proto.TensorConnection.Builder addTensorConnectionBuilder() {
-      return getTensorConnectionFieldBuilder().addBuilder(
+      return internalGetTensorConnectionFieldBuilder().addBuilder(
           org.tensorflow.proto.TensorConnection.getDefaultInstance());
     }
     /**
@@ -2315,7 +2316,7 @@ public org.tensorflow.proto.TensorConnection.Builder addTensorConnectionBuilder(
      */
     public org.tensorflow.proto.TensorConnection.Builder addTensorConnectionBuilder(
         int index) {
-      return getTensorConnectionFieldBuilder().addBuilder(
+      return internalGetTensorConnectionFieldBuilder().addBuilder(
           index, org.tensorflow.proto.TensorConnection.getDefaultInstance());
     }
     /**
@@ -2329,11 +2330,11 @@ public org.tensorflow.proto.TensorConnection.Builder addTensorConnectionBuilder(
      */
     public java.util.List 
          getTensorConnectionBuilderList() {
-      return getTensorConnectionFieldBuilder().getBuilderList();
+      return internalGetTensorConnectionFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.TensorConnection, org.tensorflow.proto.TensorConnection.Builder, org.tensorflow.proto.TensorConnectionOrBuilder> 
-        getTensorConnectionFieldBuilder() {
+        internalGetTensorConnectionFieldBuilder() {
       if (tensorConnectionBuilder_ == null) {
         tensorConnectionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TensorConnection, org.tensorflow.proto.TensorConnection.Builder, org.tensorflow.proto.TensorConnectionOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CallableOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CallableOptionsOrBuilder.java
index 422a47d8e89..5377377211c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CallableOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CallableOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface CallableOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.CallableOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDef.java
index e0593e89941..3f3c4fc101a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/cluster.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.ClusterDef}
  */
+@com.google.protobuf.Generated
 public final class ClusterDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ClusterDef)
@@ -21,8 +22,8 @@ public final class ClusterDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ClusterDef.class.getName());
   }
@@ -392,7 +393,7 @@ public Builder mergeFrom(org.tensorflow.proto.ClusterDef other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             jobBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getJobFieldBuilder() : null;
+                 internalGetJobFieldBuilder() : null;
           } else {
             jobBuilder_.addAllMessages(other.job_);
           }
@@ -686,7 +687,7 @@ public Builder removeJob(int index) {
      */
     public org.tensorflow.proto.JobDef.Builder getJobBuilder(
         int index) {
-      return getJobFieldBuilder().getBuilder(index);
+      return internalGetJobFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -725,7 +726,7 @@ public org.tensorflow.proto.JobDefOrBuilder getJobOrBuilder(
      * repeated .tensorflow.JobDef job = 1;
      */
     public org.tensorflow.proto.JobDef.Builder addJobBuilder() {
-      return getJobFieldBuilder().addBuilder(
+      return internalGetJobFieldBuilder().addBuilder(
           org.tensorflow.proto.JobDef.getDefaultInstance());
     }
     /**
@@ -737,7 +738,7 @@ public org.tensorflow.proto.JobDef.Builder addJobBuilder() {
      */
     public org.tensorflow.proto.JobDef.Builder addJobBuilder(
         int index) {
-      return getJobFieldBuilder().addBuilder(
+      return internalGetJobFieldBuilder().addBuilder(
           index, org.tensorflow.proto.JobDef.getDefaultInstance());
     }
     /**
@@ -749,11 +750,11 @@ public org.tensorflow.proto.JobDef.Builder addJobBuilder(
      */
     public java.util.List 
          getJobBuilderList() {
-      return getJobFieldBuilder().getBuilderList();
+      return internalGetJobFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.JobDef, org.tensorflow.proto.JobDef.Builder, org.tensorflow.proto.JobDefOrBuilder> 
-        getJobFieldBuilder() {
+        internalGetJobFieldBuilder() {
       if (jobBuilder_ == null) {
         jobBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.JobDef, org.tensorflow.proto.JobDef.Builder, org.tensorflow.proto.JobDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDefOrBuilder.java
index ffec98bc2ca..ce3d4a017d0 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/cluster.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ClusterDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ClusterDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDeviceFilters.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDeviceFilters.java
index 250aec1e1ad..d78ada96a8b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDeviceFilters.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDeviceFilters.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/device_filters.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.ClusterDeviceFilters}
  */
+@com.google.protobuf.Generated
 public final class ClusterDeviceFilters extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ClusterDeviceFilters)
@@ -21,8 +22,8 @@ public final class ClusterDeviceFilters extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ClusterDeviceFilters.class.getName());
   }
@@ -372,7 +373,7 @@ public Builder mergeFrom(org.tensorflow.proto.ClusterDeviceFilters other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             jobsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getJobsFieldBuilder() : null;
+                 internalGetJobsFieldBuilder() : null;
           } else {
             jobsBuilder_.addAllMessages(other.jobs_);
           }
@@ -614,7 +615,7 @@ public Builder removeJobs(int index) {
      */
     public org.tensorflow.proto.JobDeviceFilters.Builder getJobsBuilder(
         int index) {
-      return getJobsFieldBuilder().getBuilder(index);
+      return internalGetJobsFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.JobDeviceFilters jobs = 1;
@@ -641,7 +642,7 @@ public org.tensorflow.proto.JobDeviceFiltersOrBuilder getJobsOrBuilder(
      * repeated .tensorflow.JobDeviceFilters jobs = 1;
      */
     public org.tensorflow.proto.JobDeviceFilters.Builder addJobsBuilder() {
-      return getJobsFieldBuilder().addBuilder(
+      return internalGetJobsFieldBuilder().addBuilder(
           org.tensorflow.proto.JobDeviceFilters.getDefaultInstance());
     }
     /**
@@ -649,7 +650,7 @@ public org.tensorflow.proto.JobDeviceFilters.Builder addJobsBuilder() {
      */
     public org.tensorflow.proto.JobDeviceFilters.Builder addJobsBuilder(
         int index) {
-      return getJobsFieldBuilder().addBuilder(
+      return internalGetJobsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.JobDeviceFilters.getDefaultInstance());
     }
     /**
@@ -657,11 +658,11 @@ public org.tensorflow.proto.JobDeviceFilters.Builder addJobsBuilder(
      */
     public java.util.List 
          getJobsBuilderList() {
-      return getJobsFieldBuilder().getBuilderList();
+      return internalGetJobsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.JobDeviceFilters, org.tensorflow.proto.JobDeviceFilters.Builder, org.tensorflow.proto.JobDeviceFiltersOrBuilder> 
-        getJobsFieldBuilder() {
+        internalGetJobsFieldBuilder() {
       if (jobsBuilder_ == null) {
         jobsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.JobDeviceFilters, org.tensorflow.proto.JobDeviceFilters.Builder, org.tensorflow.proto.JobDeviceFiltersOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDeviceFiltersOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDeviceFiltersOrBuilder.java
index 56c5436ebcd..3cee6b07f48 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDeviceFiltersOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterDeviceFiltersOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/device_filters.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ClusterDeviceFiltersOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ClusterDeviceFilters)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterProtos.java
index 5f55a24f00b..425a699c9dd 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ClusterProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/cluster.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ClusterProtos {
   private ClusterProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ClusterProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CodeLocation.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CodeLocation.java
index c19176e024a..db30f4d8fd4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CodeLocation.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CodeLocation.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -14,6 +14,7 @@
  *
  * Protobuf type {@code tensorflow.CodeLocation}
  */
+@com.google.protobuf.Generated
 public final class CodeLocation extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.CodeLocation)
@@ -23,8 +24,8 @@ public final class CodeLocation extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CodeLocation.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CodeLocationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CodeLocationOrBuilder.java
index 4c1cc378579..b454cf6fc2a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CodeLocationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CodeLocationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface CodeLocationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.CodeLocation)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CollectionDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CollectionDef.java
index e072f35c64f..c1651729603 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CollectionDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CollectionDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -73,6 +73,7 @@
  *
  * Protobuf type {@code tensorflow.CollectionDef}
  */
+@com.google.protobuf.Generated
 public final class CollectionDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.CollectionDef)
@@ -82,8 +83,8 @@ public final class CollectionDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CollectionDef.class.getName());
   }
@@ -161,8 +162,8 @@ public static final class NodeList extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NodeList.class.getName());
     }
@@ -758,8 +759,8 @@ public static final class BytesList extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         BytesList.class.getName());
     }
@@ -1311,8 +1312,8 @@ public static final class Int64List extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Int64List.class.getName());
     }
@@ -1873,8 +1874,8 @@ public static final class FloatList extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         FloatList.class.getName());
     }
@@ -2446,8 +2447,8 @@ public static final class AnyList extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         AnyList.class.getName());
     }
@@ -2797,7 +2798,7 @@ public Builder mergeFrom(org.tensorflow.proto.CollectionDef.AnyList other) {
               bitField0_ = (bitField0_ & ~0x00000001);
               valueBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getValueFieldBuilder() : null;
+                   internalGetValueFieldBuilder() : null;
             } else {
               valueBuilder_.addAllMessages(other.value_);
             }
@@ -3039,7 +3040,7 @@ public Builder removeValue(int index) {
        */
       public com.google.protobuf.Any.Builder getValueBuilder(
           int index) {
-        return getValueFieldBuilder().getBuilder(index);
+        return internalGetValueFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.Any value = 1;
@@ -3066,7 +3067,7 @@ public com.google.protobuf.AnyOrBuilder getValueOrBuilder(
        * repeated .google.protobuf.Any value = 1;
        */
       public com.google.protobuf.Any.Builder addValueBuilder() {
-        return getValueFieldBuilder().addBuilder(
+        return internalGetValueFieldBuilder().addBuilder(
             com.google.protobuf.Any.getDefaultInstance());
       }
       /**
@@ -3074,7 +3075,7 @@ public com.google.protobuf.Any.Builder addValueBuilder() {
        */
       public com.google.protobuf.Any.Builder addValueBuilder(
           int index) {
-        return getValueFieldBuilder().addBuilder(
+        return internalGetValueFieldBuilder().addBuilder(
             index, com.google.protobuf.Any.getDefaultInstance());
       }
       /**
@@ -3082,11 +3083,11 @@ public com.google.protobuf.Any.Builder addValueBuilder(
        */
       public java.util.List 
            getValueBuilderList() {
-        return getValueFieldBuilder().getBuilderList();
+        return internalGetValueFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder>(
@@ -3825,35 +3826,35 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getNodeListFieldBuilder().getBuilder(),
+                  internalGetNodeListFieldBuilder().getBuilder(),
                   extensionRegistry);
               kindCase_ = 1;
               break;
             } // case 10
             case 18: {
               input.readMessage(
-                  getBytesListFieldBuilder().getBuilder(),
+                  internalGetBytesListFieldBuilder().getBuilder(),
                   extensionRegistry);
               kindCase_ = 2;
               break;
             } // case 18
             case 26: {
               input.readMessage(
-                  getInt64ListFieldBuilder().getBuilder(),
+                  internalGetInt64ListFieldBuilder().getBuilder(),
                   extensionRegistry);
               kindCase_ = 3;
               break;
             } // case 26
             case 34: {
               input.readMessage(
-                  getFloatListFieldBuilder().getBuilder(),
+                  internalGetFloatListFieldBuilder().getBuilder(),
                   extensionRegistry);
               kindCase_ = 4;
               break;
             } // case 34
             case 42: {
               input.readMessage(
-                  getAnyListFieldBuilder().getBuilder(),
+                  internalGetAnyListFieldBuilder().getBuilder(),
                   extensionRegistry);
               kindCase_ = 5;
               break;
@@ -3994,7 +3995,7 @@ public Builder clearNodeList() {
      * .tensorflow.CollectionDef.NodeList node_list = 1;
      */
     public org.tensorflow.proto.CollectionDef.NodeList.Builder getNodeListBuilder() {
-      return getNodeListFieldBuilder().getBuilder();
+      return internalGetNodeListFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.CollectionDef.NodeList node_list = 1;
@@ -4015,7 +4016,7 @@ public org.tensorflow.proto.CollectionDef.NodeListOrBuilder getNodeListOrBuilder
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CollectionDef.NodeList, org.tensorflow.proto.CollectionDef.NodeList.Builder, org.tensorflow.proto.CollectionDef.NodeListOrBuilder> 
-        getNodeListFieldBuilder() {
+        internalGetNodeListFieldBuilder() {
       if (nodeListBuilder_ == null) {
         if (!(kindCase_ == 1)) {
           kind_ = org.tensorflow.proto.CollectionDef.NodeList.getDefaultInstance();
@@ -4136,7 +4137,7 @@ public Builder clearBytesList() {
      * .tensorflow.CollectionDef.BytesList bytes_list = 2;
      */
     public org.tensorflow.proto.CollectionDef.BytesList.Builder getBytesListBuilder() {
-      return getBytesListFieldBuilder().getBuilder();
+      return internalGetBytesListFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.CollectionDef.BytesList bytes_list = 2;
@@ -4157,7 +4158,7 @@ public org.tensorflow.proto.CollectionDef.BytesListOrBuilder getBytesListOrBuild
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CollectionDef.BytesList, org.tensorflow.proto.CollectionDef.BytesList.Builder, org.tensorflow.proto.CollectionDef.BytesListOrBuilder> 
-        getBytesListFieldBuilder() {
+        internalGetBytesListFieldBuilder() {
       if (bytesListBuilder_ == null) {
         if (!(kindCase_ == 2)) {
           kind_ = org.tensorflow.proto.CollectionDef.BytesList.getDefaultInstance();
@@ -4278,7 +4279,7 @@ public Builder clearInt64List() {
      * .tensorflow.CollectionDef.Int64List int64_list = 3;
      */
     public org.tensorflow.proto.CollectionDef.Int64List.Builder getInt64ListBuilder() {
-      return getInt64ListFieldBuilder().getBuilder();
+      return internalGetInt64ListFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.CollectionDef.Int64List int64_list = 3;
@@ -4299,7 +4300,7 @@ public org.tensorflow.proto.CollectionDef.Int64ListOrBuilder getInt64ListOrBuild
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CollectionDef.Int64List, org.tensorflow.proto.CollectionDef.Int64List.Builder, org.tensorflow.proto.CollectionDef.Int64ListOrBuilder> 
-        getInt64ListFieldBuilder() {
+        internalGetInt64ListFieldBuilder() {
       if (int64ListBuilder_ == null) {
         if (!(kindCase_ == 3)) {
           kind_ = org.tensorflow.proto.CollectionDef.Int64List.getDefaultInstance();
@@ -4420,7 +4421,7 @@ public Builder clearFloatList() {
      * .tensorflow.CollectionDef.FloatList float_list = 4;
      */
     public org.tensorflow.proto.CollectionDef.FloatList.Builder getFloatListBuilder() {
-      return getFloatListFieldBuilder().getBuilder();
+      return internalGetFloatListFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.CollectionDef.FloatList float_list = 4;
@@ -4441,7 +4442,7 @@ public org.tensorflow.proto.CollectionDef.FloatListOrBuilder getFloatListOrBuild
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CollectionDef.FloatList, org.tensorflow.proto.CollectionDef.FloatList.Builder, org.tensorflow.proto.CollectionDef.FloatListOrBuilder> 
-        getFloatListFieldBuilder() {
+        internalGetFloatListFieldBuilder() {
       if (floatListBuilder_ == null) {
         if (!(kindCase_ == 4)) {
           kind_ = org.tensorflow.proto.CollectionDef.FloatList.getDefaultInstance();
@@ -4562,7 +4563,7 @@ public Builder clearAnyList() {
      * .tensorflow.CollectionDef.AnyList any_list = 5;
      */
     public org.tensorflow.proto.CollectionDef.AnyList.Builder getAnyListBuilder() {
-      return getAnyListFieldBuilder().getBuilder();
+      return internalGetAnyListFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.CollectionDef.AnyList any_list = 5;
@@ -4583,7 +4584,7 @@ public org.tensorflow.proto.CollectionDef.AnyListOrBuilder getAnyListOrBuilder()
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CollectionDef.AnyList, org.tensorflow.proto.CollectionDef.AnyList.Builder, org.tensorflow.proto.CollectionDef.AnyListOrBuilder> 
-        getAnyListFieldBuilder() {
+        internalGetAnyListFieldBuilder() {
       if (anyListBuilder_ == null) {
         if (!(kindCase_ == 5)) {
           kind_ = org.tensorflow.proto.CollectionDef.AnyList.getDefaultInstance();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CollectionDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CollectionDefOrBuilder.java
index 0b80d88866e..a8539d52c30 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CollectionDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CollectionDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface CollectionDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.CollectionDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CommitId.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CommitId.java
index e47f5125f55..9ce1eadc4c0 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CommitId.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CommitId.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.CommitId}
  */
+@com.google.protobuf.Generated
 public final class CommitId extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.CommitId)
@@ -17,8 +18,8 @@ public final class CommitId extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CommitId.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CommitIdOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CommitIdOrBuilder.java
index 0975a2c537f..8a0b033b067 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CommitIdOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CommitIdOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface CommitIdOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.CommitId)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CompositeTensorVariant.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CompositeTensorVariant.java
index 80fd1875558..f7f338f601d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CompositeTensorVariant.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CompositeTensorVariant.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/composite_tensor_variant.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class CompositeTensorVariant {
   private CompositeTensorVariant() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CompositeTensorVariant.class.getName());
   }
@@ -64,8 +65,8 @@ public static final class CompositeTensorVariantMetadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CompositeTensorVariantMetadata.class.getName());
     }
@@ -319,7 +320,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getTypeSpecProtoFieldBuilder();
+          internalGetTypeSpecProtoFieldBuilder();
         }
       }
       @java.lang.Override
@@ -417,7 +418,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getTypeSpecProtoFieldBuilder().getBuilder(),
+                    internalGetTypeSpecProtoFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -530,7 +531,7 @@ public Builder clearTypeSpecProto() {
       public org.tensorflow.proto.Struct.TypeSpecProto.Builder getTypeSpecProtoBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getTypeSpecProtoFieldBuilder().getBuilder();
+        return internalGetTypeSpecProtoFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TypeSpecProto type_spec_proto = 1;
@@ -548,7 +549,7 @@ public org.tensorflow.proto.Struct.TypeSpecProtoOrBuilder getTypeSpecProtoOrBuil
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.TypeSpecProto, org.tensorflow.proto.Struct.TypeSpecProto.Builder, org.tensorflow.proto.Struct.TypeSpecProtoOrBuilder> 
-          getTypeSpecProtoFieldBuilder() {
+          internalGetTypeSpecProtoFieldBuilder() {
         if (typeSpecProtoBuilder_ == null) {
           typeSpecProtoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.Struct.TypeSpecProto, org.tensorflow.proto.Struct.TypeSpecProto.Builder, org.tensorflow.proto.Struct.TypeSpecProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CondContextDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CondContextDef.java
index a75ca0e43fb..81e24b19a64 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CondContextDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CondContextDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.CondContextDef}
  */
+@com.google.protobuf.Generated
 public final class CondContextDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.CondContextDef)
@@ -21,8 +22,8 @@ public final class CondContextDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CondContextDef.class.getName());
   }
@@ -559,8 +560,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getValuesDefFieldBuilder();
-        getNestedContextsFieldBuilder();
+        internalGetValuesDefFieldBuilder();
+        internalGetNestedContextsFieldBuilder();
       }
     }
     @java.lang.Override
@@ -704,7 +705,7 @@ public Builder mergeFrom(org.tensorflow.proto.CondContextDef other) {
             bitField0_ = (bitField0_ & ~0x00000020);
             nestedContextsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNestedContextsFieldBuilder() : null;
+                 internalGetNestedContextsFieldBuilder() : null;
           } else {
             nestedContextsBuilder_.addAllMessages(other.nestedContexts_);
           }
@@ -758,7 +759,7 @@ public Builder mergeFrom(
             } // case 32
             case 42: {
               input.readMessage(
-                  getValuesDefFieldBuilder().getBuilder(),
+                  internalGetValuesDefFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000010;
               break;
@@ -1232,7 +1233,7 @@ public Builder clearValuesDef() {
     public org.tensorflow.proto.ValuesDef.Builder getValuesDefBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
-      return getValuesDefFieldBuilder().getBuilder();
+      return internalGetValuesDefFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1258,7 +1259,7 @@ public org.tensorflow.proto.ValuesDefOrBuilder getValuesDefOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.ValuesDef, org.tensorflow.proto.ValuesDef.Builder, org.tensorflow.proto.ValuesDefOrBuilder> 
-        getValuesDefFieldBuilder() {
+        internalGetValuesDefFieldBuilder() {
       if (valuesDefBuilder_ == null) {
         valuesDefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.ValuesDef, org.tensorflow.proto.ValuesDef.Builder, org.tensorflow.proto.ValuesDefOrBuilder>(
@@ -1502,7 +1503,7 @@ public Builder removeNestedContexts(int index) {
      */
     public org.tensorflow.proto.ControlFlowContextDef.Builder getNestedContextsBuilder(
         int index) {
-      return getNestedContextsFieldBuilder().getBuilder(index);
+      return internalGetNestedContextsFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1541,7 +1542,7 @@ public org.tensorflow.proto.ControlFlowContextDefOrBuilder getNestedContextsOrBu
      * repeated .tensorflow.ControlFlowContextDef nested_contexts = 6;
      */
     public org.tensorflow.proto.ControlFlowContextDef.Builder addNestedContextsBuilder() {
-      return getNestedContextsFieldBuilder().addBuilder(
+      return internalGetNestedContextsFieldBuilder().addBuilder(
           org.tensorflow.proto.ControlFlowContextDef.getDefaultInstance());
     }
     /**
@@ -1553,7 +1554,7 @@ public org.tensorflow.proto.ControlFlowContextDef.Builder addNestedContextsBuild
      */
     public org.tensorflow.proto.ControlFlowContextDef.Builder addNestedContextsBuilder(
         int index) {
-      return getNestedContextsFieldBuilder().addBuilder(
+      return internalGetNestedContextsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ControlFlowContextDef.getDefaultInstance());
     }
     /**
@@ -1565,11 +1566,11 @@ public org.tensorflow.proto.ControlFlowContextDef.Builder addNestedContextsBuild
      */
     public java.util.List 
          getNestedContextsBuilderList() {
-      return getNestedContextsFieldBuilder().getBuilderList();
+      return internalGetNestedContextsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ControlFlowContextDef, org.tensorflow.proto.ControlFlowContextDef.Builder, org.tensorflow.proto.ControlFlowContextDefOrBuilder> 
-        getNestedContextsFieldBuilder() {
+        internalGetNestedContextsFieldBuilder() {
       if (nestedContextsBuilder_ == null) {
         nestedContextsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ControlFlowContextDef, org.tensorflow.proto.ControlFlowContextDef.Builder, org.tensorflow.proto.ControlFlowContextDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CondContextDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CondContextDefOrBuilder.java
index e136d8849da..61918f6597f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CondContextDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CondContextDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface CondContextDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.CondContextDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProto.java
index 08d6ec83d47..d84229b8c5b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.ConfigProto}
  */
+@com.google.protobuf.Generated
 public final class ConfigProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ConfigProto)
@@ -22,8 +23,8 @@ public final class ConfigProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ConfigProto.class.getName());
   }
@@ -524,6 +525,42 @@ public interface ExperimentalOrBuilder extends
      * @return The finalizeResourceManager.
      */
     boolean getFinalizeResourceManager();
+
+    /**
+     * 
+     * If set, TF2XLA will dump compilation call arguments to the specified
+     * directory.
+     * 

+     *
+     * string tf2xla_dump_dir = 35;
+     * @return The tf2xlaDumpDir.
+     */
+    java.lang.String getTf2XlaDumpDir();
+    /**
+     * 
+     * If set, TF2XLA will dump compilation call arguments to the specified
+     * directory.
+     * 

+     *
+     * string tf2xla_dump_dir = 35;
+     * @return The bytes for tf2xlaDumpDir.
+     */
+    com.google.protobuf.ByteString
+        getTf2XlaDumpDirBytes();
+
+    /**
+     * 
+     * When set to true, the online op cost analysis will be enabled. This
+     * will run the cost analysis once for the first model execution and
+     * use the obtained cost to optimize subsequent executions.
+     * Typically `stream_merge_threshold` should be tuned to set to a non-zero
+     * value when this option is enabled.
+     * 

+     *
+     * bool online_cost_analysis = 36;
+     * @return The onlineCostAnalysis.
+     */
+    boolean getOnlineCostAnalysis();
   }
   /**
    * 
@@ -543,8 +580,8 @@ public static final class Experimental extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Experimental.class.getName());
     }
@@ -556,6 +593,7 @@ private Experimental() {
       collectiveGroupLeader_ = "";
       executorType_ = "";
       mlirBridgeRollout_ = 0;
+      tf2XlaDumpDir_ = "";
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor
@@ -612,8 +650,8 @@ public enum MlirBridgeRollout
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           MlirBridgeRollout.class.getName());
       }
@@ -699,7 +737,7 @@ public MlirBridgeRollout findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.ConfigProto.Experimental.getDescriptor().getEnumTypes().get(0);
       }
@@ -1395,6 +1433,74 @@ public boolean getFinalizeResourceManager() {
       return finalizeResourceManager_;
     }
 
+    public static final int TF2XLA_DUMP_DIR_FIELD_NUMBER = 35;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object tf2XlaDumpDir_ = "";
+    /**
+     * 
+     * If set, TF2XLA will dump compilation call arguments to the specified
+     * directory.
+     * 

+     *
+     * string tf2xla_dump_dir = 35;
+     * @return The tf2xlaDumpDir.
+     */
+    @java.lang.Override
+    public java.lang.String getTf2XlaDumpDir() {
+      java.lang.Object ref = tf2XlaDumpDir_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        tf2XlaDumpDir_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * If set, TF2XLA will dump compilation call arguments to the specified
+     * directory.
+     * 

+     *
+     * string tf2xla_dump_dir = 35;
+     * @return The bytes for tf2xlaDumpDir.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getTf2XlaDumpDirBytes() {
+      java.lang.Object ref = tf2XlaDumpDir_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        tf2XlaDumpDir_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int ONLINE_COST_ANALYSIS_FIELD_NUMBER = 36;
+    private boolean onlineCostAnalysis_ = false;
+    /**
+     * 
+     * When set to true, the online op cost analysis will be enabled. This
+     * will run the cost analysis once for the first model execution and
+     * use the obtained cost to optimize subsequent executions.
+     * Typically `stream_merge_threshold` should be tuned to set to a non-zero
+     * value when this option is enabled.
+     * 

+     *
+     * bool online_cost_analysis = 36;
+     * @return The onlineCostAnalysis.
+     */
+    @java.lang.Override
+    public boolean getOnlineCostAnalysis() {
+      return onlineCostAnalysis_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1499,6 +1605,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (finalizeResourceManager_ != false) {
         output.writeBool(34, finalizeResourceManager_);
       }
+      if (!com.google.protobuf.GeneratedMessage.isStringEmpty(tf2XlaDumpDir_)) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 35, tf2XlaDumpDir_);
+      }
+      if (onlineCostAnalysis_ != false) {
+        output.writeBool(36, onlineCostAnalysis_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -1626,6 +1738,13 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(34, finalizeResourceManager_);
       }
+      if (!com.google.protobuf.GeneratedMessage.isStringEmpty(tf2XlaDumpDir_)) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(35, tf2XlaDumpDir_);
+      }
+      if (onlineCostAnalysis_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(36, onlineCostAnalysis_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1706,6 +1825,10 @@ public boolean equals(final java.lang.Object obj) {
           != other.getFinalizeFunctionLibraryRuntime()) return false;
       if (getFinalizeResourceManager()
           != other.getFinalizeResourceManager()) return false;
+      if (!getTf2XlaDumpDir()
+          .equals(other.getTf2XlaDumpDir())) return false;
+      if (getOnlineCostAnalysis()
+          != other.getOnlineCostAnalysis()) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -1803,6 +1926,11 @@ public int hashCode() {
       hash = (37 * hash) + FINALIZE_RESOURCE_MANAGER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getFinalizeResourceManager());
+      hash = (37 * hash) + TF2XLA_DUMP_DIR_FIELD_NUMBER;
+      hash = (53 * hash) + getTf2XlaDumpDir().hashCode();
+      hash = (37 * hash) + ONLINE_COST_ANALYSIS_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getOnlineCostAnalysis());
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1939,8 +2067,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getSessionMetadataFieldBuilder();
-          getCoordinationConfigFieldBuilder();
+          internalGetSessionMetadataFieldBuilder();
+          internalGetCoordinationConfigFieldBuilder();
         }
       }
       @java.lang.Override
@@ -1985,6 +2113,8 @@ public Builder clear() {
         disableEagerExecutorStreamingEnqueue_ = false;
         finalizeFunctionLibraryRuntime_ = false;
         finalizeResourceManager_ = false;
+        tf2XlaDumpDir_ = "";
+        onlineCostAnalysis_ = false;
         return this;
       }
 
@@ -2115,6 +2245,12 @@ private void buildPartial0(org.tensorflow.proto.ConfigProto.Experimental result)
         if (((from_bitField0_ & 0x20000000) != 0)) {
           result.finalizeResourceManager_ = finalizeResourceManager_;
         }
+        if (((from_bitField0_ & 0x40000000) != 0)) {
+          result.tf2XlaDumpDir_ = tf2XlaDumpDir_;
+        }
+        if (((from_bitField0_ & 0x80000000) != 0)) {
+          result.onlineCostAnalysis_ = onlineCostAnalysis_;
+        }
         result.bitField0_ |= to_bitField0_;
       }
 
@@ -2224,6 +2360,14 @@ public Builder mergeFrom(org.tensorflow.proto.ConfigProto.Experimental other) {
         if (other.getFinalizeResourceManager() != false) {
           setFinalizeResourceManager(other.getFinalizeResourceManager());
         }
+        if (!other.getTf2XlaDumpDir().isEmpty()) {
+          tf2XlaDumpDir_ = other.tf2XlaDumpDir_;
+          bitField0_ |= 0x40000000;
+          onChanged();
+        }
+        if (other.getOnlineCostAnalysis() != false) {
+          setOnlineCostAnalysis(other.getOnlineCostAnalysis());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -2297,7 +2441,7 @@ public Builder mergeFrom(
               } // case 80
               case 90: {
                 input.readMessage(
-                    getSessionMetadataFieldBuilder().getBuilder(),
+                    internalGetSessionMetadataFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000200;
                 break;
@@ -2349,7 +2493,7 @@ public Builder mergeFrom(
               } // case 176
               case 186: {
                 input.readMessage(
-                    getCoordinationConfigFieldBuilder().getBuilder(),
+                    internalGetCoordinationConfigFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x02000000;
                 break;
@@ -2404,6 +2548,16 @@ public Builder mergeFrom(
                 bitField0_ |= 0x20000000;
                 break;
               } // case 272
+              case 282: {
+                tf2XlaDumpDir_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x40000000;
+                break;
+              } // case 282
+              case 288: {
+                onlineCostAnalysis_ = input.readBool();
+                bitField0_ |= 0x80000000;
+                break;
+              } // case 288
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -3166,7 +3320,7 @@ public Builder clearSessionMetadata() {
       public org.tensorflow.proto.SessionMetadata.Builder getSessionMetadataBuilder() {
         bitField0_ |= 0x00000200;
         onChanged();
-        return getSessionMetadataFieldBuilder().getBuilder();
+        return internalGetSessionMetadataFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3204,7 +3358,7 @@ public org.tensorflow.proto.SessionMetadataOrBuilder getSessionMetadataOrBuilder
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SessionMetadata, org.tensorflow.proto.SessionMetadata.Builder, org.tensorflow.proto.SessionMetadataOrBuilder> 
-          getSessionMetadataFieldBuilder() {
+          internalGetSessionMetadataFieldBuilder() {
         if (sessionMetadataBuilder_ == null) {
           sessionMetadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.SessionMetadata, org.tensorflow.proto.SessionMetadata.Builder, org.tensorflow.proto.SessionMetadataOrBuilder>(
@@ -3399,9 +3553,7 @@ public org.tensorflow.proto.ConfigProto.Experimental.MlirBridgeRollout getMlirBr
        * @return This builder for chaining.
        */
       public Builder setMlirBridgeRollout(org.tensorflow.proto.ConfigProto.Experimental.MlirBridgeRollout value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00001000;
         mlirBridgeRollout_ = value.getNumber();
         onChanged();
@@ -4129,7 +4281,7 @@ public Builder clearCoordinationConfig() {
       public org.tensorflow.proto.CoordinationConfig.CoordinationServiceConfig.Builder getCoordinationConfigBuilder() {
         bitField0_ |= 0x02000000;
         onChanged();
-        return getCoordinationConfigFieldBuilder().getBuilder();
+        return internalGetCoordinationConfigFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -4155,7 +4307,7 @@ public org.tensorflow.proto.CoordinationConfig.CoordinationServiceConfigOrBuilde
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.CoordinationConfig.CoordinationServiceConfig, org.tensorflow.proto.CoordinationConfig.CoordinationServiceConfig.Builder, org.tensorflow.proto.CoordinationConfig.CoordinationServiceConfigOrBuilder> 
-          getCoordinationConfigFieldBuilder() {
+          internalGetCoordinationConfigFieldBuilder() {
         if (coordinationConfigBuilder_ == null) {
           coordinationConfigBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.CoordinationConfig.CoordinationServiceConfig, org.tensorflow.proto.CoordinationConfig.CoordinationServiceConfig.Builder, org.tensorflow.proto.CoordinationConfig.CoordinationServiceConfigOrBuilder>(
@@ -4379,6 +4531,159 @@ public Builder clearFinalizeResourceManager() {
         return this;
       }
 
+      private java.lang.Object tf2XlaDumpDir_ = "";
+      /**
+       * 
+       * If set, TF2XLA will dump compilation call arguments to the specified
+       * directory.
+       * 

+       *
+       * string tf2xla_dump_dir = 35;
+       * @return The tf2xlaDumpDir.
+       */
+      public java.lang.String getTf2XlaDumpDir() {
+        java.lang.Object ref = tf2XlaDumpDir_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          tf2XlaDumpDir_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * 
+       * If set, TF2XLA will dump compilation call arguments to the specified
+       * directory.
+       * 

+       *
+       * string tf2xla_dump_dir = 35;
+       * @return The bytes for tf2xlaDumpDir.
+       */
+      public com.google.protobuf.ByteString
+          getTf2XlaDumpDirBytes() {
+        java.lang.Object ref = tf2XlaDumpDir_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          tf2XlaDumpDir_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * 
+       * If set, TF2XLA will dump compilation call arguments to the specified
+       * directory.
+       * 

+       *
+       * string tf2xla_dump_dir = 35;
+       * @param value The tf2xlaDumpDir to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTf2XlaDumpDir(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        tf2XlaDumpDir_ = value;
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * If set, TF2XLA will dump compilation call arguments to the specified
+       * directory.
+       * 

+       *
+       * string tf2xla_dump_dir = 35;
+       * @return This builder for chaining.
+       */
+      public Builder clearTf2XlaDumpDir() {
+        tf2XlaDumpDir_ = getDefaultInstance().getTf2XlaDumpDir();
+        bitField0_ = (bitField0_ & ~0x40000000);
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * If set, TF2XLA will dump compilation call arguments to the specified
+       * directory.
+       * 

+       *
+       * string tf2xla_dump_dir = 35;
+       * @param value The bytes for tf2xlaDumpDir to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTf2XlaDumpDirBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        checkByteStringIsUtf8(value);
+        tf2XlaDumpDir_ = value;
+        bitField0_ |= 0x40000000;
+        onChanged();
+        return this;
+      }
+
+      private boolean onlineCostAnalysis_ ;
+      /**
+       * 
+       * When set to true, the online op cost analysis will be enabled. This
+       * will run the cost analysis once for the first model execution and
+       * use the obtained cost to optimize subsequent executions.
+       * Typically `stream_merge_threshold` should be tuned to set to a non-zero
+       * value when this option is enabled.
+       * 

+       *
+       * bool online_cost_analysis = 36;
+       * @return The onlineCostAnalysis.
+       */
+      @java.lang.Override
+      public boolean getOnlineCostAnalysis() {
+        return onlineCostAnalysis_;
+      }
+      /**
+       * 
+       * When set to true, the online op cost analysis will be enabled. This
+       * will run the cost analysis once for the first model execution and
+       * use the obtained cost to optimize subsequent executions.
+       * Typically `stream_merge_threshold` should be tuned to set to a non-zero
+       * value when this option is enabled.
+       * 

+       *
+       * bool online_cost_analysis = 36;
+       * @param value The onlineCostAnalysis to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOnlineCostAnalysis(boolean value) {
+
+        onlineCostAnalysis_ = value;
+        bitField0_ |= 0x80000000;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * When set to true, the online op cost analysis will be enabled. This
+       * will run the cost analysis once for the first model execution and
+       * use the obtained cost to optimize subsequent executions.
+       * Typically `stream_merge_threshold` should be tuned to set to a non-zero
+       * value when this option is enabled.
+       * 

+       *
+       * bool online_cost_analysis = 36;
+       * @return This builder for chaining.
+       */
+      public Builder clearOnlineCostAnalysis() {
+        bitField0_ = (bitField0_ & ~0x80000000);
+        onlineCostAnalysis_ = false;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:tensorflow.ConfigProto.Experimental)
     }
 
@@ -5602,13 +5907,13 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getSessionInterOpThreadPoolFieldBuilder();
-        getGpuOptionsFieldBuilder();
-        getPluggableDeviceOptionsFieldBuilder();
-        getGraphOptionsFieldBuilder();
-        getRpcOptionsFieldBuilder();
-        getClusterDefFieldBuilder();
-        getExperimentalFieldBuilder();
+        internalGetSessionInterOpThreadPoolFieldBuilder();
+        internalGetGpuOptionsFieldBuilder();
+        internalGetPluggableDeviceOptionsFieldBuilder();
+        internalGetGraphOptionsFieldBuilder();
+        internalGetRpcOptionsFieldBuilder();
+        internalGetClusterDefFieldBuilder();
+        internalGetExperimentalFieldBuilder();
       }
     }
     @java.lang.Override
@@ -5829,7 +6134,7 @@ public Builder mergeFrom(org.tensorflow.proto.ConfigProto other) {
             bitField0_ = (bitField0_ & ~0x00000010);
             sessionInterOpThreadPoolBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getSessionInterOpThreadPoolFieldBuilder() : null;
+                 internalGetSessionInterOpThreadPoolFieldBuilder() : null;
           } else {
             sessionInterOpThreadPoolBuilder_.addAllMessages(other.sessionInterOpThreadPool_);
           }
@@ -5939,7 +6244,7 @@ public Builder mergeFrom(
             } // case 40
             case 50: {
               input.readMessage(
-                  getGpuOptionsFieldBuilder().getBuilder(),
+                  internalGetGpuOptionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000080;
               break;
@@ -5961,7 +6266,7 @@ public Builder mergeFrom(
             } // case 72
             case 82: {
               input.readMessage(
-                  getGraphOptionsFieldBuilder().getBuilder(),
+                  internalGetGraphOptionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000800;
               break;
@@ -5986,14 +6291,14 @@ public Builder mergeFrom(
             } // case 98
             case 106: {
               input.readMessage(
-                  getRpcOptionsFieldBuilder().getBuilder(),
+                  internalGetRpcOptionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00002000;
               break;
             } // case 106
             case 114: {
               input.readMessage(
-                  getClusterDefFieldBuilder().getBuilder(),
+                  internalGetClusterDefFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00004000;
               break;
@@ -6005,7 +6310,7 @@ public Builder mergeFrom(
             } // case 120
             case 130: {
               input.readMessage(
-                  getExperimentalFieldBuilder().getBuilder(),
+                  internalGetExperimentalFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00020000;
               break;
@@ -6017,7 +6322,7 @@ public Builder mergeFrom(
             } // case 136
             case 146: {
               input.readMessage(
-                  getPluggableDeviceOptionsFieldBuilder().getBuilder(),
+                  internalGetPluggableDeviceOptionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000100;
               break;
@@ -6898,7 +7203,7 @@ public Builder removeSessionInterOpThreadPool(int index) {
      */
     public org.tensorflow.proto.ThreadPoolOptionProto.Builder getSessionInterOpThreadPoolBuilder(
         int index) {
-      return getSessionInterOpThreadPoolFieldBuilder().getBuilder(index);
+      return internalGetSessionInterOpThreadPoolFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -6991,7 +7296,7 @@ public org.tensorflow.proto.ThreadPoolOptionProtoOrBuilder getSessionInterOpThre
      * repeated .tensorflow.ThreadPoolOptionProto session_inter_op_thread_pool = 12;
      */
     public org.tensorflow.proto.ThreadPoolOptionProto.Builder addSessionInterOpThreadPoolBuilder() {
-      return getSessionInterOpThreadPoolFieldBuilder().addBuilder(
+      return internalGetSessionInterOpThreadPoolFieldBuilder().addBuilder(
           org.tensorflow.proto.ThreadPoolOptionProto.getDefaultInstance());
     }
     /**
@@ -7021,7 +7326,7 @@ public org.tensorflow.proto.ThreadPoolOptionProto.Builder addSessionInterOpThrea
      */
     public org.tensorflow.proto.ThreadPoolOptionProto.Builder addSessionInterOpThreadPoolBuilder(
         int index) {
-      return getSessionInterOpThreadPoolFieldBuilder().addBuilder(
+      return internalGetSessionInterOpThreadPoolFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ThreadPoolOptionProto.getDefaultInstance());
     }
     /**
@@ -7051,11 +7356,11 @@ public org.tensorflow.proto.ThreadPoolOptionProto.Builder addSessionInterOpThrea
      */
     public java.util.List 
          getSessionInterOpThreadPoolBuilderList() {
-      return getSessionInterOpThreadPoolFieldBuilder().getBuilderList();
+      return internalGetSessionInterOpThreadPoolFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ThreadPoolOptionProto, org.tensorflow.proto.ThreadPoolOptionProto.Builder, org.tensorflow.proto.ThreadPoolOptionProtoOrBuilder> 
-        getSessionInterOpThreadPoolFieldBuilder() {
+        internalGetSessionInterOpThreadPoolFieldBuilder() {
       if (sessionInterOpThreadPoolBuilder_ == null) {
         sessionInterOpThreadPoolBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ThreadPoolOptionProto, org.tensorflow.proto.ThreadPoolOptionProto.Builder, org.tensorflow.proto.ThreadPoolOptionProtoOrBuilder>(
@@ -7402,7 +7707,7 @@ public Builder clearGpuOptions() {
     public org.tensorflow.proto.GPUOptions.Builder getGpuOptionsBuilder() {
       bitField0_ |= 0x00000080;
       onChanged();
-      return getGpuOptionsFieldBuilder().getBuilder();
+      return internalGetGpuOptionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -7428,7 +7733,7 @@ public org.tensorflow.proto.GPUOptionsOrBuilder getGpuOptionsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GPUOptions, org.tensorflow.proto.GPUOptions.Builder, org.tensorflow.proto.GPUOptionsOrBuilder> 
-        getGpuOptionsFieldBuilder() {
+        internalGetGpuOptionsFieldBuilder() {
       if (gpuOptionsBuilder_ == null) {
         gpuOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.GPUOptions, org.tensorflow.proto.GPUOptions.Builder, org.tensorflow.proto.GPUOptionsOrBuilder>(
@@ -7559,7 +7864,7 @@ public Builder clearPluggableDeviceOptions() {
     public org.tensorflow.proto.GPUOptions.Builder getPluggableDeviceOptionsBuilder() {
       bitField0_ |= 0x00000100;
       onChanged();
-      return getPluggableDeviceOptionsFieldBuilder().getBuilder();
+      return internalGetPluggableDeviceOptionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -7585,7 +7890,7 @@ public org.tensorflow.proto.GPUOptionsOrBuilder getPluggableDeviceOptionsOrBuild
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GPUOptions, org.tensorflow.proto.GPUOptions.Builder, org.tensorflow.proto.GPUOptionsOrBuilder> 
-        getPluggableDeviceOptionsFieldBuilder() {
+        internalGetPluggableDeviceOptionsFieldBuilder() {
       if (pluggableDeviceOptionsBuilder_ == null) {
         pluggableDeviceOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.GPUOptions, org.tensorflow.proto.GPUOptions.Builder, org.tensorflow.proto.GPUOptionsOrBuilder>(
@@ -7822,7 +8127,7 @@ public Builder clearGraphOptions() {
     public org.tensorflow.proto.GraphOptions.Builder getGraphOptionsBuilder() {
       bitField0_ |= 0x00000800;
       onChanged();
-      return getGraphOptionsFieldBuilder().getBuilder();
+      return internalGetGraphOptionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -7848,7 +8153,7 @@ public org.tensorflow.proto.GraphOptionsOrBuilder getGraphOptionsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GraphOptions, org.tensorflow.proto.GraphOptions.Builder, org.tensorflow.proto.GraphOptionsOrBuilder> 
-        getGraphOptionsFieldBuilder() {
+        internalGetGraphOptionsFieldBuilder() {
       if (graphOptionsBuilder_ == null) {
         graphOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.GraphOptions, org.tensorflow.proto.GraphOptions.Builder, org.tensorflow.proto.GraphOptionsOrBuilder>(
@@ -8029,7 +8334,7 @@ public Builder clearRpcOptions() {
     public org.tensorflow.proto.RpcOptions.RPCOptions.Builder getRpcOptionsBuilder() {
       bitField0_ |= 0x00002000;
       onChanged();
-      return getRpcOptionsFieldBuilder().getBuilder();
+      return internalGetRpcOptionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -8055,7 +8360,7 @@ public org.tensorflow.proto.RpcOptions.RPCOptionsOrBuilder getRpcOptionsOrBuilde
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.RpcOptions.RPCOptions, org.tensorflow.proto.RpcOptions.RPCOptions.Builder, org.tensorflow.proto.RpcOptions.RPCOptionsOrBuilder> 
-        getRpcOptionsFieldBuilder() {
+        internalGetRpcOptionsFieldBuilder() {
       if (rpcOptionsBuilder_ == null) {
         rpcOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.RpcOptions.RPCOptions, org.tensorflow.proto.RpcOptions.RPCOptions.Builder, org.tensorflow.proto.RpcOptions.RPCOptionsOrBuilder>(
@@ -8186,7 +8491,7 @@ public Builder clearClusterDef() {
     public org.tensorflow.proto.ClusterDef.Builder getClusterDefBuilder() {
       bitField0_ |= 0x00004000;
       onChanged();
-      return getClusterDefFieldBuilder().getBuilder();
+      return internalGetClusterDefFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -8212,7 +8517,7 @@ public org.tensorflow.proto.ClusterDefOrBuilder getClusterDefOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.ClusterDef, org.tensorflow.proto.ClusterDef.Builder, org.tensorflow.proto.ClusterDefOrBuilder> 
-        getClusterDefFieldBuilder() {
+        internalGetClusterDefFieldBuilder() {
       if (clusterDefBuilder_ == null) {
         clusterDefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.ClusterDef, org.tensorflow.proto.ClusterDef.Builder, org.tensorflow.proto.ClusterDefOrBuilder>(
@@ -8418,7 +8723,7 @@ public Builder clearExperimental() {
     public org.tensorflow.proto.ConfigProto.Experimental.Builder getExperimentalBuilder() {
       bitField0_ |= 0x00020000;
       onChanged();
-      return getExperimentalFieldBuilder().getBuilder();
+      return internalGetExperimentalFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.ConfigProto.Experimental experimental = 16;
@@ -8436,7 +8741,7 @@ public org.tensorflow.proto.ConfigProto.ExperimentalOrBuilder getExperimentalOrB
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.ConfigProto.Experimental, org.tensorflow.proto.ConfigProto.Experimental.Builder, org.tensorflow.proto.ConfigProto.ExperimentalOrBuilder> 
-        getExperimentalFieldBuilder() {
+        internalGetExperimentalFieldBuilder() {
       if (experimentalBuilder_ == null) {
         experimentalBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.ConfigProto.Experimental, org.tensorflow.proto.ConfigProto.Experimental.Builder, org.tensorflow.proto.ConfigProto.ExperimentalOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProtoOrBuilder.java
index 915822fff06..f901ff5c2cf 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ConfigProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ConfigProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProtos.java
index 63e85085fa7..46922e34229 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ConfigProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ConfigProtos {
   private ConfigProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ConfigProtos.class.getName());
   }
@@ -203,7 +204,7 @@ public static void registerAllExtensions(
       "mon_subexpression_elimination\"A\n\025ThreadP" +
       "oolOptionProto\022\023\n\013num_threads\030\001 \001(\005\022\023\n\013g" +
       "lobal_name\030\002 \001(\t\"0\n\017SessionMetadata\022\014\n\004n" +
-      "ame\030\001 \001(\t\022\017\n\007version\030\002 \001(\003\"\264\021\n\013ConfigPro" +
+      "ame\030\001 \001(\t\022\017\n\007version\030\002 \001(\003\"\353\021\n\013ConfigPro" +
       "to\022>\n\014device_count\030\001 \003(\0132(.tensorflow.Co" +
       "nfigProto.DeviceCountEntry\022$\n\034intra_op_p" +
       "arallelism_threads\030\002 \001(\005\022$\n\034inter_op_par" +
@@ -224,7 +225,7 @@ public static void registerAllExtensions(
       "r_devices_in_session\030\021 \001(\010\022:\n\014experiment" +
       "al\030\020 \001(\0132$.tensorflow.ConfigProto.Experi" +
       "mental\0322\n\020DeviceCountEntry\022\013\n\003key\030\001 \001(\t\022" +
-      "\r\n\005value\030\002 \001(\005:\0028\001\032\364\n\n\014Experimental\022\037\n\027c" +
+      "\r\n\005value\030\002 \001(\005:\0028\001\032\253\013\n\014Experimental\022\037\n\027c" +
       "ollective_group_leader\030\001 \001(\t\022\025\n\rexecutor" +
       "_type\030\003 \001(\t\022\032\n\022recv_buf_max_chunk\030\004 \001(\005\022" +
       "\031\n\021use_numa_affinity\030\005 \001(\010\0225\n-collective" +
@@ -253,59 +254,61 @@ public static void registerAllExtensions(
       "\0220\n(disable_eager_executor_streaming_enq" +
       "ueue\030\032 \001(\010\022)\n!finalize_function_library_" +
       "runtime\030! \001(\010\022!\n\031finalize_resource_manag" +
-      "er\030\" \001(\010\"\336\001\n\021MlirBridgeRollout\022#\n\037MLIR_B" +
-      "RIDGE_ROLLOUT_UNSPECIFIED\020\000\022\037\n\033MLIR_BRID" +
-      "GE_ROLLOUT_ENABLED\020\001\022 \n\034MLIR_BRIDGE_ROLL" +
-      "OUT_DISABLED\020\002\"\004\010\003\020\003\"\004\010\004\020\004*%MLIR_BRIDGE_" +
-      "ROLLOUT_SAFE_MODE_ENABLED*.MLIR_BRIDGE_R" +
-      "OLLOUT_SAFE_MODE_FALLBACK_ENABLEDJ\004\010\002\020\003J" +
-      "\004\010\023\020\024J\004\010\024\020\025J\004\010\031\020\032\"\341\004\n\nRunOptions\0226\n\013trac" +
-      "e_level\030\001 \001(\0162!.tensorflow.RunOptions.Tr" +
-      "aceLevel\022\025\n\rtimeout_in_ms\030\002 \001(\003\022\034\n\024inter" +
-      "_op_thread_pool\030\003 \001(\005\022\037\n\027output_partitio" +
-      "n_graphs\030\005 \001(\010\022/\n\rdebug_options\030\006 \001(\0132\030." +
-      "tensorflow.DebugOptions\022*\n\"report_tensor" +
-      "_allocations_upon_oom\030\007 \001(\010\0229\n\014experimen" +
-      "tal\030\010 \001(\0132#.tensorflow.RunOptions.Experi" +
-      "mental\032\322\001\n\014Experimental\022\034\n\024collective_gr" +
-      "aph_key\030\001 \001(\003\022\034\n\024use_run_handler_pool\030\002 " +
-      "\001(\010\022[\n\030run_handler_pool_options\030\003 \001(\01329." +
-      "tensorflow.RunOptions.Experimental.RunHa" +
-      "ndlerPoolOptions\032)\n\025RunHandlerPoolOption" +
-      "s\022\020\n\010priority\030\001 \001(\003\"R\n\nTraceLevel\022\014\n\010NO_" +
-      "TRACE\020\000\022\022\n\016SOFTWARE_TRACE\020\001\022\022\n\016HARDWARE_" +
-      "TRACE\020\002\022\016\n\nFULL_TRACE\020\003J\004\010\004\020\005\"\276\003\n\013RunMet" +
-      "adata\022)\n\nstep_stats\030\001 \001(\0132\025.tensorflow.S" +
-      "tepStats\022,\n\ncost_graph\030\002 \001(\0132\030.tensorflo" +
-      "w.CostGraphDef\022.\n\020partition_graphs\030\003 \003(\013" +
-      "2\024.tensorflow.GraphDef\022?\n\017function_graph" +
-      "s\030\004 \003(\0132&.tensorflow.RunMetadata.Functio" +
-      "nGraphs\0225\n\020session_metadata\030\005 \001(\0132\033.tens" +
-      "orflow.SessionMetadata\032\255\001\n\016FunctionGraph" +
-      "s\022.\n\020partition_graphs\030\001 \003(\0132\024.tensorflow" +
-      ".GraphDef\0224\n\026pre_optimization_graph\030\002 \001(" +
-      "\0132\024.tensorflow.GraphDef\0225\n\027post_optimiza" +
-      "tion_graph\030\003 \001(\0132\024.tensorflow.GraphDef\":" +
-      "\n\020TensorConnection\022\023\n\013from_tensor\030\001 \001(\t\022" +
-      "\021\n\tto_tensor\030\002 \001(\t\"\260\003\n\017CallableOptions\022\014" +
-      "\n\004feed\030\001 \003(\t\022\r\n\005fetch\030\002 \003(\t\022\016\n\006target\030\003 " +
-      "\003(\t\022+\n\013run_options\030\004 \001(\0132\026.tensorflow.Ru" +
-      "nOptions\0227\n\021tensor_connection\030\005 \003(\0132\034.te" +
-      "nsorflow.TensorConnection\022B\n\014feed_device" +
-      "s\030\006 \003(\0132,.tensorflow.CallableOptions.Fee" +
-      "dDevicesEntry\022D\n\rfetch_devices\030\007 \003(\0132-.t" +
-      "ensorflow.CallableOptions.FetchDevicesEn" +
-      "try\022\027\n\017fetch_skip_sync\030\010 \001(\010\0322\n\020FeedDevi" +
-      "cesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" +
-      "\0323\n\021FetchDevicesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
-      "lue\030\002 \001(\t:\0028\001\"\235\001\n\017BatchingOptions\022\031\n\021num" +
-      "_batch_threads\030\001 \001(\005\022\026\n\016max_batch_size\030\002" +
-      " \001(\005\022\034\n\024batch_timeout_micros\030\003 \001(\005\022\033\n\023al" +
-      "lowed_batch_sizes\030\004 \003(\005\022\034\n\024max_enqueued_" +
-      "batches\030\005 \001(\005B\200\001\n\024org.tensorflow.protoB\014" +
-      "ConfigProtosP\001ZUgithub.com/tensorflow/te" +
-      "nsorflow/tensorflow/go/core/protobuf/for" +
-      "_core_protos_go_proto\370\001\001b\006proto3"
+      "er\030\" \001(\010\022\027\n\017tf2xla_dump_dir\030# \001(\t\022\034\n\024onl" +
+      "ine_cost_analysis\030$ \001(\010\"\336\001\n\021MlirBridgeRo" +
+      "llout\022#\n\037MLIR_BRIDGE_ROLLOUT_UNSPECIFIED" +
+      "\020\000\022\037\n\033MLIR_BRIDGE_ROLLOUT_ENABLED\020\001\022 \n\034M" +
+      "LIR_BRIDGE_ROLLOUT_DISABLED\020\002\"\004\010\003\020\003\"\004\010\004\020" +
+      "\004*%MLIR_BRIDGE_ROLLOUT_SAFE_MODE_ENABLED" +
+      "*.MLIR_BRIDGE_ROLLOUT_SAFE_MODE_FALLBACK" +
+      "_ENABLEDJ\004\010\002\020\003J\004\010\023\020\024J\004\010\024\020\025J\004\010\031\020\032\"\341\004\n\nRun" +
+      "Options\0226\n\013trace_level\030\001 \001(\0162!.tensorflo" +
+      "w.RunOptions.TraceLevel\022\025\n\rtimeout_in_ms" +
+      "\030\002 \001(\003\022\034\n\024inter_op_thread_pool\030\003 \001(\005\022\037\n\027" +
+      "output_partition_graphs\030\005 \001(\010\022/\n\rdebug_o" +
+      "ptions\030\006 \001(\0132\030.tensorflow.DebugOptions\022*" +
+      "\n\"report_tensor_allocations_upon_oom\030\007 \001" +
+      "(\010\0229\n\014experimental\030\010 \001(\0132#.tensorflow.Ru" +
+      "nOptions.Experimental\032\322\001\n\014Experimental\022\034" +
+      "\n\024collective_graph_key\030\001 \001(\003\022\034\n\024use_run_" +
+      "handler_pool\030\002 \001(\010\022[\n\030run_handler_pool_o" +
+      "ptions\030\003 \001(\01329.tensorflow.RunOptions.Exp" +
+      "erimental.RunHandlerPoolOptions\032)\n\025RunHa" +
+      "ndlerPoolOptions\022\020\n\010priority\030\001 \001(\003\"R\n\nTr" +
+      "aceLevel\022\014\n\010NO_TRACE\020\000\022\022\n\016SOFTWARE_TRACE" +
+      "\020\001\022\022\n\016HARDWARE_TRACE\020\002\022\016\n\nFULL_TRACE\020\003J\004" +
+      "\010\004\020\005\"\276\003\n\013RunMetadata\022)\n\nstep_stats\030\001 \001(\013" +
+      "2\025.tensorflow.StepStats\022,\n\ncost_graph\030\002 " +
+      "\001(\0132\030.tensorflow.CostGraphDef\022.\n\020partiti" +
+      "on_graphs\030\003 \003(\0132\024.tensorflow.GraphDef\022?\n" +
+      "\017function_graphs\030\004 \003(\0132&.tensorflow.RunM" +
+      "etadata.FunctionGraphs\0225\n\020session_metada" +
+      "ta\030\005 \001(\0132\033.tensorflow.SessionMetadata\032\255\001" +
+      "\n\016FunctionGraphs\022.\n\020partition_graphs\030\001 \003" +
+      "(\0132\024.tensorflow.GraphDef\0224\n\026pre_optimiza" +
+      "tion_graph\030\002 \001(\0132\024.tensorflow.GraphDef\0225" +
+      "\n\027post_optimization_graph\030\003 \001(\0132\024.tensor" +
+      "flow.GraphDef\":\n\020TensorConnection\022\023\n\013fro" +
+      "m_tensor\030\001 \001(\t\022\021\n\tto_tensor\030\002 \001(\t\"\260\003\n\017Ca" +
+      "llableOptions\022\014\n\004feed\030\001 \003(\t\022\r\n\005fetch\030\002 \003" +
+      "(\t\022\016\n\006target\030\003 \003(\t\022+\n\013run_options\030\004 \001(\0132" +
+      "\026.tensorflow.RunOptions\0227\n\021tensor_connec" +
+      "tion\030\005 \003(\0132\034.tensorflow.TensorConnection" +
+      "\022B\n\014feed_devices\030\006 \003(\0132,.tensorflow.Call" +
+      "ableOptions.FeedDevicesEntry\022D\n\rfetch_de" +
+      "vices\030\007 \003(\0132-.tensorflow.CallableOptions" +
+      ".FetchDevicesEntry\022\027\n\017fetch_skip_sync\030\010 " +
+      "\001(\010\0322\n\020FeedDevicesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" +
+      "value\030\002 \001(\t:\0028\001\0323\n\021FetchDevicesEntry\022\013\n\003" +
+      "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\235\001\n\017Batchin" +
+      "gOptions\022\031\n\021num_batch_threads\030\001 \001(\005\022\026\n\016m" +
+      "ax_batch_size\030\002 \001(\005\022\034\n\024batch_timeout_mic" +
+      "ros\030\003 \001(\005\022\033\n\023allowed_batch_sizes\030\004 \003(\005\022\034" +
+      "\n\024max_enqueued_batches\030\005 \001(\005B\200\001\n\024org.ten" +
+      "sorflow.protoB\014ConfigProtosP\001ZUgithub.co" +
+      "m/tensorflow/tensorflow/tensorflow/go/co" +
+      "re/protobuf/for_core_protos_go_proto\370\001\001b" +
+      "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -384,7 +387,7 @@ public static void registerAllExtensions(
     internal_static_tensorflow_ConfigProto_Experimental_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_tensorflow_ConfigProto_Experimental_descriptor,
-        new java.lang.String[] { "CollectiveGroupLeader", "ExecutorType", "RecvBufMaxChunk", "UseNumaAffinity", "CollectiveDeterministicSequentialExecution", "CollectiveNccl", "ShareSessionStateInClusterspecPropagation", "DisableThreadSpinning", "ShareClusterDevicesInSession", "SessionMetadata", "OptimizeForStaticGraph", "EnableMlirBridge", "MlirBridgeRollout", "EnableMlirGraphOptimization", "DisableOutputPartitionGraphs", "XlaFusionAutotunerThresh", "UseTfrt", "EnableMultiHost", "TfrtUseIfrt", "BackendServerPort", "TargetTpu", "TargetGpu", "StreamMergeThreshold", "DisableFunctionalOpsLowering", "XlaPreferSingleGraphCluster", "CoordinationConfig", "DisableOptimizeForStaticGraph", "DisableEagerExecutorStreamingEnqueue", "FinalizeFunctionLibraryRuntime", "FinalizeResourceManager", });
+        new java.lang.String[] { "CollectiveGroupLeader", "ExecutorType", "RecvBufMaxChunk", "UseNumaAffinity", "CollectiveDeterministicSequentialExecution", "CollectiveNccl", "ShareSessionStateInClusterspecPropagation", "DisableThreadSpinning", "ShareClusterDevicesInSession", "SessionMetadata", "OptimizeForStaticGraph", "EnableMlirBridge", "MlirBridgeRollout", "EnableMlirGraphOptimization", "DisableOutputPartitionGraphs", "XlaFusionAutotunerThresh", "UseTfrt", "EnableMultiHost", "TfrtUseIfrt", "BackendServerPort", "TargetTpu", "TargetGpu", "StreamMergeThreshold", "DisableFunctionalOpsLowering", "XlaPreferSingleGraphCluster", "CoordinationConfig", "DisableOptimizeForStaticGraph", "DisableEagerExecutorStreamingEnqueue", "FinalizeFunctionLibraryRuntime", "FinalizeResourceManager", "Tf2XlaDumpDir", "OnlineCostAnalysis", });
     internal_static_tensorflow_RunOptions_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_tensorflow_RunOptions_fieldAccessorTable = new
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowContextDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowContextDef.java
index 94e682160fc..bea391d0d32 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowContextDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowContextDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.ControlFlowContextDef}
  */
+@com.google.protobuf.Generated
 public final class ControlFlowContextDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ControlFlowContextDef)
@@ -22,8 +23,8 @@ public final class ControlFlowContextDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ControlFlowContextDef.class.getName());
   }
@@ -485,14 +486,14 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getCondCtxtFieldBuilder().getBuilder(),
+                  internalGetCondCtxtFieldBuilder().getBuilder(),
                   extensionRegistry);
               ctxtCase_ = 1;
               break;
             } // case 10
             case 18: {
               input.readMessage(
-                  getWhileCtxtFieldBuilder().getBuilder(),
+                  internalGetWhileCtxtFieldBuilder().getBuilder(),
                   extensionRegistry);
               ctxtCase_ = 2;
               break;
@@ -633,7 +634,7 @@ public Builder clearCondCtxt() {
      * .tensorflow.CondContextDef cond_ctxt = 1;
      */
     public org.tensorflow.proto.CondContextDef.Builder getCondCtxtBuilder() {
-      return getCondCtxtFieldBuilder().getBuilder();
+      return internalGetCondCtxtFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.CondContextDef cond_ctxt = 1;
@@ -654,7 +655,7 @@ public org.tensorflow.proto.CondContextDefOrBuilder getCondCtxtOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CondContextDef, org.tensorflow.proto.CondContextDef.Builder, org.tensorflow.proto.CondContextDefOrBuilder> 
-        getCondCtxtFieldBuilder() {
+        internalGetCondCtxtFieldBuilder() {
       if (condCtxtBuilder_ == null) {
         if (!(ctxtCase_ == 1)) {
           ctxt_ = org.tensorflow.proto.CondContextDef.getDefaultInstance();
@@ -775,7 +776,7 @@ public Builder clearWhileCtxt() {
      * .tensorflow.WhileContextDef while_ctxt = 2;
      */
     public org.tensorflow.proto.WhileContextDef.Builder getWhileCtxtBuilder() {
-      return getWhileCtxtFieldBuilder().getBuilder();
+      return internalGetWhileCtxtFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.WhileContextDef while_ctxt = 2;
@@ -796,7 +797,7 @@ public org.tensorflow.proto.WhileContextDefOrBuilder getWhileCtxtOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.WhileContextDef, org.tensorflow.proto.WhileContextDef.Builder, org.tensorflow.proto.WhileContextDefOrBuilder> 
-        getWhileCtxtFieldBuilder() {
+        internalGetWhileCtxtFieldBuilder() {
       if (whileCtxtBuilder_ == null) {
         if (!(ctxtCase_ == 2)) {
           ctxt_ = org.tensorflow.proto.WhileContextDef.getDefaultInstance();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowContextDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowContextDefOrBuilder.java
index 0fba58feb04..7c4e3c7c6e5 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowContextDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowContextDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ControlFlowContextDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ControlFlowContextDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowProtos.java
index 522e46a72f2..223599edb56 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ControlFlowProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ControlFlowProtos {
   private ControlFlowProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ControlFlowProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CoordinationConfig.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CoordinationConfig.java
index f032747ea8e..b7c591e06ce 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CoordinationConfig.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CoordinationConfig.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/coordination_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class CoordinationConfig {
   private CoordinationConfig() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CoordinationConfig.class.getName());
   }
@@ -64,8 +65,8 @@ public static final class CoordinatedJob extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CoordinatedJob.class.getName());
     }
@@ -867,8 +868,8 @@ public static final class CoordinationServiceConfig extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CoordinationServiceConfig.class.getName());
     }
@@ -1756,7 +1757,7 @@ public Builder mergeFrom(org.tensorflow.proto.CoordinationConfig.CoordinationSer
               bitField0_ = (bitField0_ & ~0x00000040);
               coordinatedJobListBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getCoordinatedJobListFieldBuilder() : null;
+                   internalGetCoordinatedJobListFieldBuilder() : null;
             } else {
               coordinatedJobListBuilder_.addAllMessages(other.coordinatedJobList_);
             }
@@ -2474,7 +2475,7 @@ public Builder removeCoordinatedJobList(int index) {
        */
       public org.tensorflow.proto.CoordinationConfig.CoordinatedJob.Builder getCoordinatedJobListBuilder(
           int index) {
-        return getCoordinatedJobListFieldBuilder().getBuilder(index);
+        return internalGetCoordinatedJobListFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.CoordinatedJob coordinated_job_list = 10;
@@ -2501,7 +2502,7 @@ public org.tensorflow.proto.CoordinationConfig.CoordinatedJobOrBuilder getCoordi
        * repeated .tensorflow.CoordinatedJob coordinated_job_list = 10;
        */
       public org.tensorflow.proto.CoordinationConfig.CoordinatedJob.Builder addCoordinatedJobListBuilder() {
-        return getCoordinatedJobListFieldBuilder().addBuilder(
+        return internalGetCoordinatedJobListFieldBuilder().addBuilder(
             org.tensorflow.proto.CoordinationConfig.CoordinatedJob.getDefaultInstance());
       }
       /**
@@ -2509,7 +2510,7 @@ public org.tensorflow.proto.CoordinationConfig.CoordinatedJob.Builder addCoordin
        */
       public org.tensorflow.proto.CoordinationConfig.CoordinatedJob.Builder addCoordinatedJobListBuilder(
           int index) {
-        return getCoordinatedJobListFieldBuilder().addBuilder(
+        return internalGetCoordinatedJobListFieldBuilder().addBuilder(
             index, org.tensorflow.proto.CoordinationConfig.CoordinatedJob.getDefaultInstance());
       }
       /**
@@ -2517,11 +2518,11 @@ public org.tensorflow.proto.CoordinationConfig.CoordinatedJob.Builder addCoordin
        */
       public java.util.List 
            getCoordinatedJobListBuilderList() {
-        return getCoordinatedJobListFieldBuilder().getBuilderList();
+        return internalGetCoordinatedJobListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.CoordinationConfig.CoordinatedJob, org.tensorflow.proto.CoordinationConfig.CoordinatedJob.Builder, org.tensorflow.proto.CoordinationConfig.CoordinatedJobOrBuilder> 
-          getCoordinatedJobListFieldBuilder() {
+          internalGetCoordinatedJobListFieldBuilder() {
         if (coordinatedJobListBuilder_ == null) {
           coordinatedJobListBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.CoordinationConfig.CoordinatedJob, org.tensorflow.proto.CoordinationConfig.CoordinatedJob.Builder, org.tensorflow.proto.CoordinationConfig.CoordinatedJobOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphDef.java
index c1b43631e02..1f2c3a454d9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphDef.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/cost_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.CostGraphDef}
  */
+@com.google.protobuf.Generated
 public final class CostGraphDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.CostGraphDef)
@@ -17,8 +18,8 @@ public final class CostGraphDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CostGraphDef.class.getName());
   }
@@ -286,8 +287,8 @@ public static final class Node extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Node.class.getName());
     }
@@ -350,8 +351,8 @@ public static final class InputInfo extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           InputInfo.class.getName());
       }
@@ -898,8 +899,8 @@ public static final class OutputInfo extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           OutputInfo.class.getName());
       }
@@ -1230,7 +1231,7 @@ private Builder(
         private void maybeForceBuilderInitialization() {
           if (com.google.protobuf.GeneratedMessage
                   .alwaysUseFieldBuilders) {
-            getShapeFieldBuilder();
+            internalGetShapeFieldBuilder();
           }
         }
         @java.lang.Override
@@ -1359,7 +1360,7 @@ public Builder mergeFrom(
                 } // case 16
                 case 26: {
                   input.readMessage(
-                      getShapeFieldBuilder().getBuilder(),
+                      internalGetShapeFieldBuilder().getBuilder(),
                       extensionRegistry);
                   bitField0_ |= 0x00000004;
                   break;
@@ -1559,7 +1560,7 @@ public Builder clearShape() {
         public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
           bitField0_ |= 0x00000004;
           onChanged();
-          return getShapeFieldBuilder().getBuilder();
+          return internalGetShapeFieldBuilder().getBuilder();
         }
         /**
          * .tensorflow.TensorShapeProto shape = 3;
@@ -1577,7 +1578,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
          */
         private com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-            getShapeFieldBuilder() {
+            internalGetShapeFieldBuilder() {
           if (shapeBuilder_ == null) {
             shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                 org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -1623,9 +1624,7 @@ public org.tensorflow.proto.DataType getDtype() {
          * @return This builder for chaining.
          */
         public Builder setDtype(org.tensorflow.proto.DataType value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00000008;
           dtype_ = value.getNumber();
           onChanged();
@@ -2633,7 +2632,7 @@ public Builder mergeFrom(org.tensorflow.proto.CostGraphDef.Node other) {
               bitField0_ = (bitField0_ & ~0x00000008);
               inputInfoBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getInputInfoFieldBuilder() : null;
+                   internalGetInputInfoFieldBuilder() : null;
             } else {
               inputInfoBuilder_.addAllMessages(other.inputInfo_);
             }
@@ -2659,7 +2658,7 @@ public Builder mergeFrom(org.tensorflow.proto.CostGraphDef.Node other) {
               bitField0_ = (bitField0_ & ~0x00000010);
               outputInfoBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getOutputInfoFieldBuilder() : null;
+                   internalGetOutputInfoFieldBuilder() : null;
             } else {
               outputInfoBuilder_.addAllMessages(other.outputInfo_);
             }
@@ -3269,7 +3268,7 @@ public Builder removeInputInfo(int index) {
        */
       public org.tensorflow.proto.CostGraphDef.Node.InputInfo.Builder getInputInfoBuilder(
           int index) {
-        return getInputInfoFieldBuilder().getBuilder(index);
+        return internalGetInputInfoFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.CostGraphDef.Node.InputInfo input_info = 4;
@@ -3296,7 +3295,7 @@ public org.tensorflow.proto.CostGraphDef.Node.InputInfoOrBuilder getInputInfoOrB
        * repeated .tensorflow.CostGraphDef.Node.InputInfo input_info = 4;
        */
       public org.tensorflow.proto.CostGraphDef.Node.InputInfo.Builder addInputInfoBuilder() {
-        return getInputInfoFieldBuilder().addBuilder(
+        return internalGetInputInfoFieldBuilder().addBuilder(
             org.tensorflow.proto.CostGraphDef.Node.InputInfo.getDefaultInstance());
       }
       /**
@@ -3304,7 +3303,7 @@ public org.tensorflow.proto.CostGraphDef.Node.InputInfo.Builder addInputInfoBuil
        */
       public org.tensorflow.proto.CostGraphDef.Node.InputInfo.Builder addInputInfoBuilder(
           int index) {
-        return getInputInfoFieldBuilder().addBuilder(
+        return internalGetInputInfoFieldBuilder().addBuilder(
             index, org.tensorflow.proto.CostGraphDef.Node.InputInfo.getDefaultInstance());
       }
       /**
@@ -3312,11 +3311,11 @@ public org.tensorflow.proto.CostGraphDef.Node.InputInfo.Builder addInputInfoBuil
        */
       public java.util.List 
            getInputInfoBuilderList() {
-        return getInputInfoFieldBuilder().getBuilderList();
+        return internalGetInputInfoFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.CostGraphDef.Node.InputInfo, org.tensorflow.proto.CostGraphDef.Node.InputInfo.Builder, org.tensorflow.proto.CostGraphDef.Node.InputInfoOrBuilder> 
-          getInputInfoFieldBuilder() {
+          internalGetInputInfoFieldBuilder() {
         if (inputInfoBuilder_ == null) {
           inputInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.CostGraphDef.Node.InputInfo, org.tensorflow.proto.CostGraphDef.Node.InputInfo.Builder, org.tensorflow.proto.CostGraphDef.Node.InputInfoOrBuilder>(
@@ -3509,7 +3508,7 @@ public Builder removeOutputInfo(int index) {
        */
       public org.tensorflow.proto.CostGraphDef.Node.OutputInfo.Builder getOutputInfoBuilder(
           int index) {
-        return getOutputInfoFieldBuilder().getBuilder(index);
+        return internalGetOutputInfoFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.CostGraphDef.Node.OutputInfo output_info = 5;
@@ -3536,7 +3535,7 @@ public org.tensorflow.proto.CostGraphDef.Node.OutputInfoOrBuilder getOutputInfoO
        * repeated .tensorflow.CostGraphDef.Node.OutputInfo output_info = 5;
        */
       public org.tensorflow.proto.CostGraphDef.Node.OutputInfo.Builder addOutputInfoBuilder() {
-        return getOutputInfoFieldBuilder().addBuilder(
+        return internalGetOutputInfoFieldBuilder().addBuilder(
             org.tensorflow.proto.CostGraphDef.Node.OutputInfo.getDefaultInstance());
       }
       /**
@@ -3544,7 +3543,7 @@ public org.tensorflow.proto.CostGraphDef.Node.OutputInfo.Builder addOutputInfoBu
        */
       public org.tensorflow.proto.CostGraphDef.Node.OutputInfo.Builder addOutputInfoBuilder(
           int index) {
-        return getOutputInfoFieldBuilder().addBuilder(
+        return internalGetOutputInfoFieldBuilder().addBuilder(
             index, org.tensorflow.proto.CostGraphDef.Node.OutputInfo.getDefaultInstance());
       }
       /**
@@ -3552,11 +3551,11 @@ public org.tensorflow.proto.CostGraphDef.Node.OutputInfo.Builder addOutputInfoBu
        */
       public java.util.List 
            getOutputInfoBuilderList() {
-        return getOutputInfoFieldBuilder().getBuilderList();
+        return internalGetOutputInfoFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.CostGraphDef.Node.OutputInfo, org.tensorflow.proto.CostGraphDef.Node.OutputInfo.Builder, org.tensorflow.proto.CostGraphDef.Node.OutputInfoOrBuilder> 
-          getOutputInfoFieldBuilder() {
+          internalGetOutputInfoFieldBuilder() {
         if (outputInfoBuilder_ == null) {
           outputInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.CostGraphDef.Node.OutputInfo, org.tensorflow.proto.CostGraphDef.Node.OutputInfo.Builder, org.tensorflow.proto.CostGraphDef.Node.OutputInfoOrBuilder>(
@@ -4213,8 +4212,8 @@ public static final class AggregatedCost extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         AggregatedCost.class.getName());
     }
@@ -4563,7 +4562,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(org.tensorflow.proto.CostGraphDef.AggregatedCost other) {
         if (other == org.tensorflow.proto.CostGraphDef.AggregatedCost.getDefaultInstance()) return this;
-        if (other.getCost() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getCost()) != 0) {
           setCost(other.getCost());
         }
         if (!other.getDimension().isEmpty()) {
@@ -5202,7 +5201,7 @@ public Builder mergeFrom(org.tensorflow.proto.CostGraphDef other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             nodeBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNodeFieldBuilder() : null;
+                 internalGetNodeFieldBuilder() : null;
           } else {
             nodeBuilder_.addAllMessages(other.node_);
           }
@@ -5228,7 +5227,7 @@ public Builder mergeFrom(org.tensorflow.proto.CostGraphDef other) {
             bitField0_ = (bitField0_ & ~0x00000002);
             costBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getCostFieldBuilder() : null;
+                 internalGetCostFieldBuilder() : null;
           } else {
             costBuilder_.addAllMessages(other.cost_);
           }
@@ -5483,7 +5482,7 @@ public Builder removeNode(int index) {
      */
     public org.tensorflow.proto.CostGraphDef.Node.Builder getNodeBuilder(
         int index) {
-      return getNodeFieldBuilder().getBuilder(index);
+      return internalGetNodeFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.CostGraphDef.Node node = 1;
@@ -5510,7 +5509,7 @@ public org.tensorflow.proto.CostGraphDef.NodeOrBuilder getNodeOrBuilder(
      * repeated .tensorflow.CostGraphDef.Node node = 1;
      */
     public org.tensorflow.proto.CostGraphDef.Node.Builder addNodeBuilder() {
-      return getNodeFieldBuilder().addBuilder(
+      return internalGetNodeFieldBuilder().addBuilder(
           org.tensorflow.proto.CostGraphDef.Node.getDefaultInstance());
     }
     /**
@@ -5518,7 +5517,7 @@ public org.tensorflow.proto.CostGraphDef.Node.Builder addNodeBuilder() {
      */
     public org.tensorflow.proto.CostGraphDef.Node.Builder addNodeBuilder(
         int index) {
-      return getNodeFieldBuilder().addBuilder(
+      return internalGetNodeFieldBuilder().addBuilder(
           index, org.tensorflow.proto.CostGraphDef.Node.getDefaultInstance());
     }
     /**
@@ -5526,11 +5525,11 @@ public org.tensorflow.proto.CostGraphDef.Node.Builder addNodeBuilder(
      */
     public java.util.List 
          getNodeBuilderList() {
-      return getNodeFieldBuilder().getBuilderList();
+      return internalGetNodeFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.CostGraphDef.Node, org.tensorflow.proto.CostGraphDef.Node.Builder, org.tensorflow.proto.CostGraphDef.NodeOrBuilder> 
-        getNodeFieldBuilder() {
+        internalGetNodeFieldBuilder() {
       if (nodeBuilder_ == null) {
         nodeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.CostGraphDef.Node, org.tensorflow.proto.CostGraphDef.Node.Builder, org.tensorflow.proto.CostGraphDef.NodeOrBuilder>(
@@ -5723,7 +5722,7 @@ public Builder removeCost(int index) {
      */
     public org.tensorflow.proto.CostGraphDef.AggregatedCost.Builder getCostBuilder(
         int index) {
-      return getCostFieldBuilder().getBuilder(index);
+      return internalGetCostFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.CostGraphDef.AggregatedCost cost = 2;
@@ -5750,7 +5749,7 @@ public org.tensorflow.proto.CostGraphDef.AggregatedCostOrBuilder getCostOrBuilde
      * repeated .tensorflow.CostGraphDef.AggregatedCost cost = 2;
      */
     public org.tensorflow.proto.CostGraphDef.AggregatedCost.Builder addCostBuilder() {
-      return getCostFieldBuilder().addBuilder(
+      return internalGetCostFieldBuilder().addBuilder(
           org.tensorflow.proto.CostGraphDef.AggregatedCost.getDefaultInstance());
     }
     /**
@@ -5758,7 +5757,7 @@ public org.tensorflow.proto.CostGraphDef.AggregatedCost.Builder addCostBuilder()
      */
     public org.tensorflow.proto.CostGraphDef.AggregatedCost.Builder addCostBuilder(
         int index) {
-      return getCostFieldBuilder().addBuilder(
+      return internalGetCostFieldBuilder().addBuilder(
           index, org.tensorflow.proto.CostGraphDef.AggregatedCost.getDefaultInstance());
     }
     /**
@@ -5766,11 +5765,11 @@ public org.tensorflow.proto.CostGraphDef.AggregatedCost.Builder addCostBuilder(
      */
     public java.util.List 
          getCostBuilderList() {
-      return getCostFieldBuilder().getBuilderList();
+      return internalGetCostFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.CostGraphDef.AggregatedCost, org.tensorflow.proto.CostGraphDef.AggregatedCost.Builder, org.tensorflow.proto.CostGraphDef.AggregatedCostOrBuilder> 
-        getCostFieldBuilder() {
+        internalGetCostFieldBuilder() {
       if (costBuilder_ == null) {
         costBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.CostGraphDef.AggregatedCost, org.tensorflow.proto.CostGraphDef.AggregatedCost.Builder, org.tensorflow.proto.CostGraphDef.AggregatedCostOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphDefOrBuilder.java
index ad2f98d6283..b025bbdfa9b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/cost_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface CostGraphDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.CostGraphDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphProtos.java
index b99348c8a2e..4425070ae69 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/CostGraphProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/cost_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class CostGraphProtos {
   private CostGraphProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CostGraphProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DataClass.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DataClass.java
index 829ae281b70..d1d0247468b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DataClass.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DataClass.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/summary.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf enum {@code tensorflow.DataClass}
  */
+@com.google.protobuf.Generated
 public enum DataClass
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -55,8 +56,8 @@ public enum DataClass
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DataClass.class.getName());
   }
@@ -156,7 +157,7 @@ public DataClass findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.SummaryProtos.getDescriptor().getEnumTypes().get(0);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DataType.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DataType.java
index efc05c83db4..b8fa6c1a154 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DataType.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DataType.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/types.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf enum {@code tensorflow.DataType}
  */
+@com.google.protobuf.Generated
 public enum DataType
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -198,6 +199,10 @@ public enum DataType
    */
   DT_FLOAT8_E5M2FNUZ(28),
   /**
+   * 
+   * with NaN.
+   * 

+   *
    * DT_INT4 = 29;
    */
   DT_INT4(29),
@@ -213,6 +218,14 @@ public enum DataType
    * DT_UINT2 = 32;
    */
   DT_UINT2(32),
+  /**
+   * 
+   * 2 exponent bits, 1 mantissa bit, finite-only
+   * 

+   *
+   * DT_FLOAT4_E2M1FN = 33;
+   */
+  DT_FLOAT4_E2M1FN(33),
   /**
    * 
    * Do not use!  These are only for TF1's obsolete reference Variables.
@@ -347,6 +360,10 @@ public enum DataType
    * DT_UINT2_REF = 132;
    */
   DT_UINT2_REF(132),
+  /**
+   * DT_FLOAT4_E2M1FN_REF = 133;
+   */
+  DT_FLOAT4_E2M1FN_REF(133),
   UNRECOGNIZED(-1),
   ;
 
@@ -354,8 +371,8 @@ public enum DataType
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DataType.class.getName());
   }
@@ -542,6 +559,10 @@ public enum DataType
    */
   public static final int DT_FLOAT8_E5M2FNUZ_VALUE = 28;
   /**
+   * 
+   * with NaN.
+   * 

+   *
    * DT_INT4 = 29;
    */
   public static final int DT_INT4_VALUE = 29;
@@ -557,6 +578,14 @@ public enum DataType
    * DT_UINT2 = 32;
    */
   public static final int DT_UINT2_VALUE = 32;
+  /**
+   * 
+   * 2 exponent bits, 1 mantissa bit, finite-only
+   * 

+   *
+   * DT_FLOAT4_E2M1FN = 33;
+   */
+  public static final int DT_FLOAT4_E2M1FN_VALUE = 33;
   /**
    * 
    * Do not use!  These are only for TF1's obsolete reference Variables.
@@ -691,6 +720,10 @@ public enum DataType
    * DT_UINT2_REF = 132;
    */
   public static final int DT_UINT2_REF_VALUE = 132;
+  /**
+   * DT_FLOAT4_E2M1FN_REF = 133;
+   */
+  public static final int DT_FLOAT4_E2M1FN_REF_VALUE = 133;
 
 
   public final int getNumber() {
@@ -750,6 +783,7 @@ public static DataType forNumber(int value) {
       case 30: return DT_UINT4;
       case 31: return DT_INT2;
       case 32: return DT_UINT2;
+      case 33: return DT_FLOAT4_E2M1FN;
       case 101: return DT_FLOAT_REF;
       case 102: return DT_DOUBLE_REF;
       case 103: return DT_INT32_REF;
@@ -782,6 +816,7 @@ public static DataType forNumber(int value) {
       case 130: return DT_UINT4_REF;
       case 131: return DT_INT2_REF;
       case 132: return DT_UINT2_REF;
+      case 133: return DT_FLOAT4_E2M1FN_REF;
       default: return null;
     }
   }
@@ -810,7 +845,7 @@ public DataType findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.TypesProtos.getDescriptor().getEnumTypes().get(0);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEvent.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEvent.java
index 8b27fc51240..0067d5cb280 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEvent.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEvent.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.DebugEvent}
  */
+@com.google.protobuf.Generated
 public final class DebugEvent extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DebugEvent)
@@ -21,8 +22,8 @@ public final class DebugEvent extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebugEvent.class.getName());
   }
@@ -1023,7 +1024,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(org.tensorflow.proto.DebugEvent other) {
       if (other == org.tensorflow.proto.DebugEvent.getDefaultInstance()) return this;
-      if (other.getWallTime() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getWallTime()) != 0) {
         setWallTime(other.getWallTime());
       }
       if (other.getStep() != 0L) {
@@ -1110,49 +1111,49 @@ public Builder mergeFrom(
             } // case 16
             case 26: {
               input.readMessage(
-                  getDebugMetadataFieldBuilder().getBuilder(),
+                  internalGetDebugMetadataFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 3;
               break;
             } // case 26
             case 34: {
               input.readMessage(
-                  getSourceFileFieldBuilder().getBuilder(),
+                  internalGetSourceFileFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 4;
               break;
             } // case 34
             case 50: {
               input.readMessage(
-                  getStackFrameWithIdFieldBuilder().getBuilder(),
+                  internalGetStackFrameWithIdFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 6;
               break;
             } // case 50
             case 58: {
               input.readMessage(
-                  getGraphOpCreationFieldBuilder().getBuilder(),
+                  internalGetGraphOpCreationFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 7;
               break;
             } // case 58
             case 66: {
               input.readMessage(
-                  getDebuggedGraphFieldBuilder().getBuilder(),
+                  internalGetDebuggedGraphFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 8;
               break;
             } // case 66
             case 74: {
               input.readMessage(
-                  getExecutionFieldBuilder().getBuilder(),
+                  internalGetExecutionFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 9;
               break;
             } // case 74
             case 82: {
               input.readMessage(
-                  getGraphExecutionTraceFieldBuilder().getBuilder(),
+                  internalGetGraphExecutionTraceFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 10;
               break;
@@ -1165,7 +1166,7 @@ public Builder mergeFrom(
             } // case 90
             case 98: {
               input.readMessage(
-                  getDebuggedDeviceFieldBuilder().getBuilder(),
+                  internalGetDebuggedDeviceFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 12;
               break;
@@ -1422,7 +1423,7 @@ public Builder clearDebugMetadata() {
      * .tensorflow.DebugMetadata debug_metadata = 3;
      */
     public org.tensorflow.proto.DebugMetadata.Builder getDebugMetadataBuilder() {
-      return getDebugMetadataFieldBuilder().getBuilder();
+      return internalGetDebugMetadataFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1451,7 +1452,7 @@ public org.tensorflow.proto.DebugMetadataOrBuilder getDebugMetadataOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.DebugMetadata, org.tensorflow.proto.DebugMetadata.Builder, org.tensorflow.proto.DebugMetadataOrBuilder> 
-        getDebugMetadataFieldBuilder() {
+        internalGetDebugMetadataFieldBuilder() {
       if (debugMetadataBuilder_ == null) {
         if (!(whatCase_ == 3)) {
           what_ = org.tensorflow.proto.DebugMetadata.getDefaultInstance();
@@ -1600,7 +1601,7 @@ public Builder clearSourceFile() {
      * .tensorflow.SourceFile source_file = 4;
      */
     public org.tensorflow.proto.SourceFile.Builder getSourceFileBuilder() {
-      return getSourceFileFieldBuilder().getBuilder();
+      return internalGetSourceFileFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1629,7 +1630,7 @@ public org.tensorflow.proto.SourceFileOrBuilder getSourceFileOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SourceFile, org.tensorflow.proto.SourceFile.Builder, org.tensorflow.proto.SourceFileOrBuilder> 
-        getSourceFileFieldBuilder() {
+        internalGetSourceFileFieldBuilder() {
       if (sourceFileBuilder_ == null) {
         if (!(whatCase_ == 4)) {
           what_ = org.tensorflow.proto.SourceFile.getDefaultInstance();
@@ -1785,7 +1786,7 @@ public Builder clearStackFrameWithId() {
      * .tensorflow.StackFrameWithId stack_frame_with_id = 6;
      */
     public org.tensorflow.proto.StackFrameWithId.Builder getStackFrameWithIdBuilder() {
-      return getStackFrameWithIdFieldBuilder().getBuilder();
+      return internalGetStackFrameWithIdFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1816,7 +1817,7 @@ public org.tensorflow.proto.StackFrameWithIdOrBuilder getStackFrameWithIdOrBuild
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.StackFrameWithId, org.tensorflow.proto.StackFrameWithId.Builder, org.tensorflow.proto.StackFrameWithIdOrBuilder> 
-        getStackFrameWithIdFieldBuilder() {
+        internalGetStackFrameWithIdFieldBuilder() {
       if (stackFrameWithIdBuilder_ == null) {
         if (!(whatCase_ == 6)) {
           what_ = org.tensorflow.proto.StackFrameWithId.getDefaultInstance();
@@ -1972,7 +1973,7 @@ public Builder clearGraphOpCreation() {
      * .tensorflow.GraphOpCreation graph_op_creation = 7;
      */
     public org.tensorflow.proto.GraphOpCreation.Builder getGraphOpCreationBuilder() {
-      return getGraphOpCreationFieldBuilder().getBuilder();
+      return internalGetGraphOpCreationFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2003,7 +2004,7 @@ public org.tensorflow.proto.GraphOpCreationOrBuilder getGraphOpCreationOrBuilder
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GraphOpCreation, org.tensorflow.proto.GraphOpCreation.Builder, org.tensorflow.proto.GraphOpCreationOrBuilder> 
-        getGraphOpCreationFieldBuilder() {
+        internalGetGraphOpCreationFieldBuilder() {
       if (graphOpCreationBuilder_ == null) {
         if (!(whatCase_ == 7)) {
           what_ = org.tensorflow.proto.GraphOpCreation.getDefaultInstance();
@@ -2152,7 +2153,7 @@ public Builder clearDebuggedGraph() {
      * .tensorflow.DebuggedGraph debugged_graph = 8;
      */
     public org.tensorflow.proto.DebuggedGraph.Builder getDebuggedGraphBuilder() {
-      return getDebuggedGraphFieldBuilder().getBuilder();
+      return internalGetDebuggedGraphFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2181,7 +2182,7 @@ public org.tensorflow.proto.DebuggedGraphOrBuilder getDebuggedGraphOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.DebuggedGraph, org.tensorflow.proto.DebuggedGraph.Builder, org.tensorflow.proto.DebuggedGraphOrBuilder> 
-        getDebuggedGraphFieldBuilder() {
+        internalGetDebuggedGraphFieldBuilder() {
       if (debuggedGraphBuilder_ == null) {
         if (!(whatCase_ == 8)) {
           what_ = org.tensorflow.proto.DebuggedGraph.getDefaultInstance();
@@ -2330,7 +2331,7 @@ public Builder clearExecution() {
      * .tensorflow.Execution execution = 9;
      */
     public org.tensorflow.proto.Execution.Builder getExecutionBuilder() {
-      return getExecutionFieldBuilder().getBuilder();
+      return internalGetExecutionFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2359,7 +2360,7 @@ public org.tensorflow.proto.ExecutionOrBuilder getExecutionOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.Execution, org.tensorflow.proto.Execution.Builder, org.tensorflow.proto.ExecutionOrBuilder> 
-        getExecutionFieldBuilder() {
+        internalGetExecutionFieldBuilder() {
       if (executionBuilder_ == null) {
         if (!(whatCase_ == 9)) {
           what_ = org.tensorflow.proto.Execution.getDefaultInstance();
@@ -2515,7 +2516,7 @@ public Builder clearGraphExecutionTrace() {
      * .tensorflow.GraphExecutionTrace graph_execution_trace = 10;
      */
     public org.tensorflow.proto.GraphExecutionTrace.Builder getGraphExecutionTraceBuilder() {
-      return getGraphExecutionTraceFieldBuilder().getBuilder();
+      return internalGetGraphExecutionTraceFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2546,7 +2547,7 @@ public org.tensorflow.proto.GraphExecutionTraceOrBuilder getGraphExecutionTraceO
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GraphExecutionTrace, org.tensorflow.proto.GraphExecutionTrace.Builder, org.tensorflow.proto.GraphExecutionTraceOrBuilder> 
-        getGraphExecutionTraceFieldBuilder() {
+        internalGetGraphExecutionTraceFieldBuilder() {
       if (graphExecutionTraceBuilder_ == null) {
         if (!(whatCase_ == 10)) {
           what_ = org.tensorflow.proto.GraphExecutionTrace.getDefaultInstance();
@@ -2818,7 +2819,7 @@ public Builder clearDebuggedDevice() {
      * .tensorflow.DebuggedDevice debugged_device = 12;
      */
     public org.tensorflow.proto.DebuggedDevice.Builder getDebuggedDeviceBuilder() {
-      return getDebuggedDeviceFieldBuilder().getBuilder();
+      return internalGetDebuggedDeviceFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2847,7 +2848,7 @@ public org.tensorflow.proto.DebuggedDeviceOrBuilder getDebuggedDeviceOrBuilder()
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.DebuggedDevice, org.tensorflow.proto.DebuggedDevice.Builder, org.tensorflow.proto.DebuggedDeviceOrBuilder> 
-        getDebuggedDeviceFieldBuilder() {
+        internalGetDebuggedDeviceFieldBuilder() {
       if (debuggedDeviceBuilder_ == null) {
         if (!(whatCase_ == 12)) {
           what_ = org.tensorflow.proto.DebuggedDevice.getDefaultInstance();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEventOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEventOrBuilder.java
index 1b36f8a0ba4..1f5da61b01d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEventOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEventOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DebugEventOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DebugEvent)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEventProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEventProtos.java
index 1c92bcac9f3..ec50e35462a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEventProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugEventProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class DebugEventProtos {
   private DebugEventProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebugEventProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugMetadata.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugMetadata.java
index 8f70d7c9067..bc5c7374b7a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugMetadata.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugMetadata.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.DebugMetadata}
  */
+@com.google.protobuf.Generated
 public final class DebugMetadata extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DebugMetadata)
@@ -21,8 +22,8 @@ public final class DebugMetadata extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebugMetadata.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugMetadataOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugMetadataOrBuilder.java
index 20d753b7194..db91a5a141d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugMetadataOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugMetadataOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DebugMetadataOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DebugMetadata)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugOptions.java
index 2e7f0fdfeda..35e866f33dc 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugOptions.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.DebugOptions}
  */
+@com.google.protobuf.Generated
 public final class DebugOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DebugOptions)
@@ -21,8 +22,8 @@ public final class DebugOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebugOptions.class.getName());
   }
@@ -459,7 +460,7 @@ public Builder mergeFrom(org.tensorflow.proto.DebugOptions other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             debugTensorWatchOptsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getDebugTensorWatchOptsFieldBuilder() : null;
+                 internalGetDebugTensorWatchOptsFieldBuilder() : null;
           } else {
             debugTensorWatchOptsBuilder_.addAllMessages(other.debugTensorWatchOpts_);
           }
@@ -769,7 +770,7 @@ public Builder removeDebugTensorWatchOpts(int index) {
      */
     public org.tensorflow.proto.DebugTensorWatch.Builder getDebugTensorWatchOptsBuilder(
         int index) {
-      return getDebugTensorWatchOptsFieldBuilder().getBuilder(index);
+      return internalGetDebugTensorWatchOptsFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -808,7 +809,7 @@ public org.tensorflow.proto.DebugTensorWatchOrBuilder getDebugTensorWatchOptsOrB
      * repeated .tensorflow.DebugTensorWatch debug_tensor_watch_opts = 4;
      */
     public org.tensorflow.proto.DebugTensorWatch.Builder addDebugTensorWatchOptsBuilder() {
-      return getDebugTensorWatchOptsFieldBuilder().addBuilder(
+      return internalGetDebugTensorWatchOptsFieldBuilder().addBuilder(
           org.tensorflow.proto.DebugTensorWatch.getDefaultInstance());
     }
     /**
@@ -820,7 +821,7 @@ public org.tensorflow.proto.DebugTensorWatch.Builder addDebugTensorWatchOptsBuil
      */
     public org.tensorflow.proto.DebugTensorWatch.Builder addDebugTensorWatchOptsBuilder(
         int index) {
-      return getDebugTensorWatchOptsFieldBuilder().addBuilder(
+      return internalGetDebugTensorWatchOptsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.DebugTensorWatch.getDefaultInstance());
     }
     /**
@@ -832,11 +833,11 @@ public org.tensorflow.proto.DebugTensorWatch.Builder addDebugTensorWatchOptsBuil
      */
     public java.util.List 
          getDebugTensorWatchOptsBuilderList() {
-      return getDebugTensorWatchOptsFieldBuilder().getBuilderList();
+      return internalGetDebugTensorWatchOptsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.DebugTensorWatch, org.tensorflow.proto.DebugTensorWatch.Builder, org.tensorflow.proto.DebugTensorWatchOrBuilder> 
-        getDebugTensorWatchOptsFieldBuilder() {
+        internalGetDebugTensorWatchOptsFieldBuilder() {
       if (debugTensorWatchOptsBuilder_ == null) {
         debugTensorWatchOptsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.DebugTensorWatch, org.tensorflow.proto.DebugTensorWatch.Builder, org.tensorflow.proto.DebugTensorWatchOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugOptionsOrBuilder.java
index ac859a7de1d..be8ba808a36 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DebugOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DebugOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugProtos.java
index ca250aff759..a168f9e8a9d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class DebugProtos {
   private DebugProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebugProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugTensorWatch.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugTensorWatch.java
index e1fc459a203..2631b9ebfa4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugTensorWatch.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugTensorWatch.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.DebugTensorWatch}
  */
+@com.google.protobuf.Generated
 public final class DebugTensorWatch extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DebugTensorWatch)
@@ -21,8 +22,8 @@ public final class DebugTensorWatch extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebugTensorWatch.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugTensorWatchOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugTensorWatchOrBuilder.java
index 842457cd90f..32d7b9baf9c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugTensorWatchOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebugTensorWatchOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DebugTensorWatchOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DebugTensorWatch)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedDevice.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedDevice.java
index d8d0b77e13c..d06521c0dae 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedDevice.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedDevice.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.DebuggedDevice}
  */
+@com.google.protobuf.Generated
 public final class DebuggedDevice extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DebuggedDevice)
@@ -21,8 +22,8 @@ public final class DebuggedDevice extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebuggedDevice.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedDeviceOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedDeviceOrBuilder.java
index 4544692e491..77634a9e020 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedDeviceOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedDeviceOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DebuggedDeviceOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DebuggedDevice)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedGraph.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedGraph.java
index d56c83a856d..80346c1e57f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedGraph.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedGraph.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.DebuggedGraph}
  */
+@com.google.protobuf.Generated
 public final class DebuggedGraph extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DebuggedGraph)
@@ -21,8 +22,8 @@ public final class DebuggedGraph extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebuggedGraph.class.getName());
   }
@@ -630,10 +631,10 @@ public Builder mergeFrom(org.tensorflow.proto.DebuggedGraph other) {
         }
         onChanged();
       }
-      if (other.getOriginalGraphDef() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getOriginalGraphDef().isEmpty()) {
         setOriginalGraphDef(other.getOriginalGraphDef());
       }
-      if (other.getInstrumentedGraphDef() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getInstrumentedGraphDef().isEmpty()) {
         setInstrumentedGraphDef(other.getInstrumentedGraphDef());
       }
       if (!other.getOuterContextId().isEmpty()) {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedGraphOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedGraphOrBuilder.java
index e4115e8f5f5..c154cdedf8b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedGraphOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedGraphOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DebuggedGraphOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DebuggedGraph)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFile.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFile.java
index 66704f19966..a92a9b3d253 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFile.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFile.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.DebuggedSourceFile}
  */
+@com.google.protobuf.Generated
 public final class DebuggedSourceFile extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DebuggedSourceFile)
@@ -17,8 +18,8 @@ public final class DebuggedSourceFile extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebuggedSourceFile.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFileOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFileOrBuilder.java
index 7ef7f4bae46..041ba744404 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFileOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFileOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DebuggedSourceFileOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DebuggedSourceFile)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFiles.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFiles.java
index 878ca2718a3..974faa68e74 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFiles.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFiles.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.DebuggedSourceFiles}
  */
+@com.google.protobuf.Generated
 public final class DebuggedSourceFiles extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DebuggedSourceFiles)
@@ -17,8 +18,8 @@ public final class DebuggedSourceFiles extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DebuggedSourceFiles.class.getName());
   }
@@ -384,7 +385,7 @@ public Builder mergeFrom(org.tensorflow.proto.DebuggedSourceFiles other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             sourceFilesBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getSourceFilesFieldBuilder() : null;
+                 internalGetSourceFilesFieldBuilder() : null;
           } else {
             sourceFilesBuilder_.addAllMessages(other.sourceFiles_);
           }
@@ -678,7 +679,7 @@ public Builder removeSourceFiles(int index) {
      */
     public org.tensorflow.proto.DebuggedSourceFile.Builder getSourceFilesBuilder(
         int index) {
-      return getSourceFilesFieldBuilder().getBuilder(index);
+      return internalGetSourceFilesFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -717,7 +718,7 @@ public org.tensorflow.proto.DebuggedSourceFileOrBuilder getSourceFilesOrBuilder(
      * repeated .tensorflow.DebuggedSourceFile source_files = 1;
      */
     public org.tensorflow.proto.DebuggedSourceFile.Builder addSourceFilesBuilder() {
-      return getSourceFilesFieldBuilder().addBuilder(
+      return internalGetSourceFilesFieldBuilder().addBuilder(
           org.tensorflow.proto.DebuggedSourceFile.getDefaultInstance());
     }
     /**
@@ -729,7 +730,7 @@ public org.tensorflow.proto.DebuggedSourceFile.Builder addSourceFilesBuilder() {
      */
     public org.tensorflow.proto.DebuggedSourceFile.Builder addSourceFilesBuilder(
         int index) {
-      return getSourceFilesFieldBuilder().addBuilder(
+      return internalGetSourceFilesFieldBuilder().addBuilder(
           index, org.tensorflow.proto.DebuggedSourceFile.getDefaultInstance());
     }
     /**
@@ -741,11 +742,11 @@ public org.tensorflow.proto.DebuggedSourceFile.Builder addSourceFilesBuilder(
      */
     public java.util.List 
          getSourceFilesBuilderList() {
-      return getSourceFilesFieldBuilder().getBuilderList();
+      return internalGetSourceFilesFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.DebuggedSourceFile, org.tensorflow.proto.DebuggedSourceFile.Builder, org.tensorflow.proto.DebuggedSourceFileOrBuilder> 
-        getSourceFilesFieldBuilder() {
+        internalGetSourceFilesFieldBuilder() {
       if (sourceFilesBuilder_ == null) {
         sourceFilesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.DebuggedSourceFile, org.tensorflow.proto.DebuggedSourceFile.Builder, org.tensorflow.proto.DebuggedSourceFileOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFilesOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFilesOrBuilder.java
index 143f2983d0f..79a506c35e2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFilesOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DebuggedSourceFilesOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DebuggedSourceFilesOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DebuggedSourceFiles)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributes.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributes.java
index 47dfd9b5b6f..7c636b032fa 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributes.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributes.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.DeviceAttributes}
  */
+@com.google.protobuf.Generated
 public final class DeviceAttributes extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DeviceAttributes)
@@ -17,8 +18,8 @@ public final class DeviceAttributes extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DeviceAttributes.class.getName());
   }
@@ -537,7 +538,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getLocalityFieldBuilder();
+        internalGetLocalityFieldBuilder();
       }
     }
     @java.lang.Override
@@ -698,7 +699,7 @@ public Builder mergeFrom(
             } // case 32
             case 42: {
               input.readMessage(
-                  getLocalityFieldBuilder().getBuilder(),
+                  internalGetLocalityFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000008;
               break;
@@ -1089,7 +1090,7 @@ public Builder clearLocality() {
     public org.tensorflow.proto.DeviceLocality.Builder getLocalityBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
-      return getLocalityFieldBuilder().getBuilder();
+      return internalGetLocalityFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1117,7 +1118,7 @@ public org.tensorflow.proto.DeviceLocalityOrBuilder getLocalityOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.DeviceLocality, org.tensorflow.proto.DeviceLocality.Builder, org.tensorflow.proto.DeviceLocalityOrBuilder> 
-        getLocalityFieldBuilder() {
+        internalGetLocalityFieldBuilder() {
       if (localityBuilder_ == null) {
         localityBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.DeviceLocality, org.tensorflow.proto.DeviceLocality.Builder, org.tensorflow.proto.DeviceLocalityOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributesOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributesOrBuilder.java
index 4215a2a77bf..db7baaa0240 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributesOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributesOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DeviceAttributesOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DeviceAttributes)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributesProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributesProtos.java
index fcfebe652af..50efb1c833c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributesProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceAttributesProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class DeviceAttributesProtos {
   private DeviceAttributesProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DeviceAttributesProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceFiltersProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceFiltersProtos.java
index c8e12f949a0..9f2522f447a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceFiltersProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceFiltersProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/device_filters.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class DeviceFiltersProtos {
   private DeviceFiltersProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DeviceFiltersProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceLocality.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceLocality.java
index 518cc8fd33b..b9abfe9391d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceLocality.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceLocality.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.DeviceLocality}
  */
+@com.google.protobuf.Generated
 public final class DeviceLocality extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DeviceLocality)
@@ -17,8 +18,8 @@ public final class DeviceLocality extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DeviceLocality.class.getName());
   }
@@ -329,7 +330,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getLinksFieldBuilder();
+        internalGetLinksFieldBuilder();
       }
     }
     @java.lang.Override
@@ -451,7 +452,7 @@ public Builder mergeFrom(
             } // case 16
             case 26: {
               input.readMessage(
-                  getLinksFieldBuilder().getBuilder(),
+                  internalGetLinksFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
@@ -683,7 +684,7 @@ public Builder clearLinks() {
     public org.tensorflow.proto.LocalLinks.Builder getLinksBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getLinksFieldBuilder().getBuilder();
+      return internalGetLinksFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -709,7 +710,7 @@ public org.tensorflow.proto.LocalLinksOrBuilder getLinksOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.LocalLinks, org.tensorflow.proto.LocalLinks.Builder, org.tensorflow.proto.LocalLinksOrBuilder> 
-        getLinksFieldBuilder() {
+        internalGetLinksFieldBuilder() {
       if (linksBuilder_ == null) {
         linksBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.LocalLinks, org.tensorflow.proto.LocalLinks.Builder, org.tensorflow.proto.LocalLinksOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceLocalityOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceLocalityOrBuilder.java
index b236260b347..459d276a622 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceLocalityOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceLocalityOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DeviceLocalityOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DeviceLocality)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DevicePropertiesProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DevicePropertiesProtos.java
index c02de359e02..31ffb4fd5c7 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DevicePropertiesProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DevicePropertiesProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/device_properties.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class DevicePropertiesProtos {
   private DevicePropertiesProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DevicePropertiesProtos.class.getName());
   }
@@ -251,8 +252,8 @@ public static final class DeviceProperties extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DeviceProperties.class.getName());
     }
@@ -2217,8 +2218,8 @@ public static final class NamedDevice extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NamedDevice.class.getName());
     }
@@ -2514,7 +2515,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getPropertiesFieldBuilder();
+          internalGetPropertiesFieldBuilder();
         }
       }
       @java.lang.Override
@@ -2626,7 +2627,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getPropertiesFieldBuilder().getBuilder(),
+                    internalGetPropertiesFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -2811,7 +2812,7 @@ public Builder clearProperties() {
       public org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties.Builder getPropertiesBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getPropertiesFieldBuilder().getBuilder();
+        return internalGetPropertiesFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.DeviceProperties properties = 2;
@@ -2829,7 +2830,7 @@ public org.tensorflow.proto.DevicePropertiesProtos.DevicePropertiesOrBuilder get
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties, org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties.Builder, org.tensorflow.proto.DevicePropertiesProtos.DevicePropertiesOrBuilder> 
-          getPropertiesFieldBuilder() {
+          internalGetPropertiesFieldBuilder() {
         if (propertiesBuilder_ == null) {
           propertiesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties, org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties.Builder, org.tensorflow.proto.DevicePropertiesProtos.DevicePropertiesOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceStepStats.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceStepStats.java
index 5796f59a3a5..9f8c3496443 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceStepStats.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceStepStats.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.DeviceStepStats}
  */
+@com.google.protobuf.Generated
 public final class DeviceStepStats extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.DeviceStepStats)
@@ -17,8 +18,8 @@ public final class DeviceStepStats extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DeviceStepStats.class.getName());
   }
@@ -579,7 +580,7 @@ public Builder mergeFrom(org.tensorflow.proto.DeviceStepStats other) {
             bitField0_ = (bitField0_ & ~0x00000002);
             nodeStatsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNodeStatsFieldBuilder() : null;
+                 internalGetNodeStatsFieldBuilder() : null;
           } else {
             nodeStatsBuilder_.addAllMessages(other.nodeStats_);
           }
@@ -910,7 +911,7 @@ public Builder removeNodeStats(int index) {
      */
     public org.tensorflow.proto.NodeExecStats.Builder getNodeStatsBuilder(
         int index) {
-      return getNodeStatsFieldBuilder().getBuilder(index);
+      return internalGetNodeStatsFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.NodeExecStats node_stats = 2;
@@ -937,7 +938,7 @@ public org.tensorflow.proto.NodeExecStatsOrBuilder getNodeStatsOrBuilder(
      * repeated .tensorflow.NodeExecStats node_stats = 2;
      */
     public org.tensorflow.proto.NodeExecStats.Builder addNodeStatsBuilder() {
-      return getNodeStatsFieldBuilder().addBuilder(
+      return internalGetNodeStatsFieldBuilder().addBuilder(
           org.tensorflow.proto.NodeExecStats.getDefaultInstance());
     }
     /**
@@ -945,7 +946,7 @@ public org.tensorflow.proto.NodeExecStats.Builder addNodeStatsBuilder() {
      */
     public org.tensorflow.proto.NodeExecStats.Builder addNodeStatsBuilder(
         int index) {
-      return getNodeStatsFieldBuilder().addBuilder(
+      return internalGetNodeStatsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.NodeExecStats.getDefaultInstance());
     }
     /**
@@ -953,11 +954,11 @@ public org.tensorflow.proto.NodeExecStats.Builder addNodeStatsBuilder(
      */
     public java.util.List 
          getNodeStatsBuilderList() {
-      return getNodeStatsFieldBuilder().getBuilderList();
+      return internalGetNodeStatsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.NodeExecStats, org.tensorflow.proto.NodeExecStats.Builder, org.tensorflow.proto.NodeExecStatsOrBuilder> 
-        getNodeStatsFieldBuilder() {
+        internalGetNodeStatsFieldBuilder() {
       if (nodeStatsBuilder_ == null) {
         nodeStatsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.NodeExecStats, org.tensorflow.proto.NodeExecStats.Builder, org.tensorflow.proto.NodeExecStatsOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceStepStatsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceStepStatsOrBuilder.java
index 40b250d1ab8..24478a72115 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceStepStatsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/DeviceStepStatsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface DeviceStepStatsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.DeviceStepStats)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EntryValue.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EntryValue.java
index 95d9ec9af7c..c968a695ad0 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EntryValue.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EntryValue.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.EntryValue}
  */
+@com.google.protobuf.Generated
 public final class EntryValue extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.EntryValue)
@@ -17,8 +18,8 @@ public final class EntryValue extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       EntryValue.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EntryValueOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EntryValueOrBuilder.java
index 19578965697..850e78aa0f2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EntryValueOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EntryValueOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface EntryValueOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.EntryValue)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ErrorCodes.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ErrorCodes.java
index c717a8b23e5..08d04f1623d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ErrorCodes.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ErrorCodes.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/lib/core/error_codes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ErrorCodes {
   private ErrorCodes() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ErrorCodes.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Event.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Event.java
index f8700f4727a..6c6f3f6a986 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Event.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Event.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.Event}
  */
+@com.google.protobuf.Generated
 public final class Event extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.Event)
@@ -22,8 +23,8 @@ public final class Event extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Event.class.getName());
   }
@@ -826,7 +827,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getSourceMetadataFieldBuilder();
+        internalGetSourceMetadataFieldBuilder();
       }
     }
     @java.lang.Override
@@ -937,7 +938,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(org.tensorflow.proto.Event other) {
       if (other == org.tensorflow.proto.Event.getDefaultInstance()) return this;
-      if (other.getWallTime() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getWallTime()) != 0) {
         setWallTime(other.getWallTime());
       }
       if (other.getStep() != 0L) {
@@ -1030,28 +1031,28 @@ public Builder mergeFrom(
             } // case 34
             case 42: {
               input.readMessage(
-                  getSummaryFieldBuilder().getBuilder(),
+                  internalGetSummaryFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 5;
               break;
             } // case 42
             case 50: {
               input.readMessage(
-                  getLogMessageFieldBuilder().getBuilder(),
+                  internalGetLogMessageFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 6;
               break;
             } // case 50
             case 58: {
               input.readMessage(
-                  getSessionLogFieldBuilder().getBuilder(),
+                  internalGetSessionLogFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 7;
               break;
             } // case 58
             case 66: {
               input.readMessage(
-                  getTaggedRunMetadataFieldBuilder().getBuilder(),
+                  internalGetTaggedRunMetadataFieldBuilder().getBuilder(),
                   extensionRegistry);
               whatCase_ = 8;
               break;
@@ -1063,7 +1064,7 @@ public Builder mergeFrom(
             } // case 74
             case 82: {
               input.readMessage(
-                  getSourceMetadataFieldBuilder().getBuilder(),
+                  internalGetSourceMetadataFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000200;
               break;
@@ -1513,7 +1514,7 @@ public Builder clearSummary() {
      * .tensorflow.Summary summary = 5;
      */
     public org.tensorflow.proto.Summary.Builder getSummaryBuilder() {
-      return getSummaryFieldBuilder().getBuilder();
+      return internalGetSummaryFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1542,7 +1543,7 @@ public org.tensorflow.proto.SummaryOrBuilder getSummaryOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.Summary, org.tensorflow.proto.Summary.Builder, org.tensorflow.proto.SummaryOrBuilder> 
-        getSummaryFieldBuilder() {
+        internalGetSummaryFieldBuilder() {
       if (summaryBuilder_ == null) {
         if (!(whatCase_ == 5)) {
           what_ = org.tensorflow.proto.Summary.getDefaultInstance();
@@ -1709,7 +1710,7 @@ public org.tensorflow.proto.SummaryOrBuilder getSummaryOrBuilder() {
      * .tensorflow.LogMessage log_message = 6 [deprecated = true];
      */
     @java.lang.Deprecated public org.tensorflow.proto.LogMessage.Builder getLogMessageBuilder() {
-      return getLogMessageFieldBuilder().getBuilder();
+      return internalGetLogMessageFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1742,7 +1743,7 @@ public org.tensorflow.proto.SummaryOrBuilder getSummaryOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.LogMessage, org.tensorflow.proto.LogMessage.Builder, org.tensorflow.proto.LogMessageOrBuilder> 
-        getLogMessageFieldBuilder() {
+        internalGetLogMessageFieldBuilder() {
       if (logMessageBuilder_ == null) {
         if (!(whatCase_ == 6)) {
           what_ = org.tensorflow.proto.LogMessage.getDefaultInstance();
@@ -1891,7 +1892,7 @@ public Builder clearSessionLog() {
      * .tensorflow.SessionLog session_log = 7;
      */
     public org.tensorflow.proto.SessionLog.Builder getSessionLogBuilder() {
-      return getSessionLogFieldBuilder().getBuilder();
+      return internalGetSessionLogFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1920,7 +1921,7 @@ public org.tensorflow.proto.SessionLogOrBuilder getSessionLogOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SessionLog, org.tensorflow.proto.SessionLog.Builder, org.tensorflow.proto.SessionLogOrBuilder> 
-        getSessionLogFieldBuilder() {
+        internalGetSessionLogFieldBuilder() {
       if (sessionLogBuilder_ == null) {
         if (!(whatCase_ == 7)) {
           what_ = org.tensorflow.proto.SessionLog.getDefaultInstance();
@@ -2069,7 +2070,7 @@ public Builder clearTaggedRunMetadata() {
      * .tensorflow.TaggedRunMetadata tagged_run_metadata = 8;
      */
     public org.tensorflow.proto.TaggedRunMetadata.Builder getTaggedRunMetadataBuilder() {
-      return getTaggedRunMetadataFieldBuilder().getBuilder();
+      return internalGetTaggedRunMetadataFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2098,7 +2099,7 @@ public org.tensorflow.proto.TaggedRunMetadataOrBuilder getTaggedRunMetadataOrBui
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TaggedRunMetadata, org.tensorflow.proto.TaggedRunMetadata.Builder, org.tensorflow.proto.TaggedRunMetadataOrBuilder> 
-        getTaggedRunMetadataFieldBuilder() {
+        internalGetTaggedRunMetadataFieldBuilder() {
       if (taggedRunMetadataBuilder_ == null) {
         if (!(whatCase_ == 8)) {
           what_ = org.tensorflow.proto.TaggedRunMetadata.getDefaultInstance();
@@ -2299,7 +2300,7 @@ public Builder clearSourceMetadata() {
     public org.tensorflow.proto.SourceMetadata.Builder getSourceMetadataBuilder() {
       bitField0_ |= 0x00000200;
       onChanged();
-      return getSourceMetadataFieldBuilder().getBuilder();
+      return internalGetSourceMetadataFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2327,7 +2328,7 @@ public org.tensorflow.proto.SourceMetadataOrBuilder getSourceMetadataOrBuilder()
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SourceMetadata, org.tensorflow.proto.SourceMetadata.Builder, org.tensorflow.proto.SourceMetadataOrBuilder> 
-        getSourceMetadataFieldBuilder() {
+        internalGetSourceMetadataFieldBuilder() {
       if (sourceMetadataBuilder_ == null) {
         sourceMetadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.SourceMetadata, org.tensorflow.proto.SourceMetadata.Builder, org.tensorflow.proto.SourceMetadataOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EventOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EventOrBuilder.java
index 61a590cfd66..e0fdef099d8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EventOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EventOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface EventOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.Event)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EventProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EventProtos.java
index ec026ec2e7f..5267510c984 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EventProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/EventProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class EventProtos {
   private EventProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       EventProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Example.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Example.java
index 4f1f03853ec..c2ae5727c17 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Example.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Example.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.Example}
  */
+@com.google.protobuf.Generated
 public final class Example extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.Example)
@@ -17,8 +18,8 @@ public final class Example extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Example.class.getName());
   }
@@ -264,7 +265,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getFeaturesFieldBuilder();
+        internalGetFeaturesFieldBuilder();
       }
     }
     @java.lang.Override
@@ -362,7 +363,7 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getFeaturesFieldBuilder().getBuilder(),
+                  internalGetFeaturesFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
@@ -475,7 +476,7 @@ public Builder clearFeatures() {
     public org.tensorflow.proto.Features.Builder getFeaturesBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getFeaturesFieldBuilder().getBuilder();
+      return internalGetFeaturesFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.Features features = 1;
@@ -493,7 +494,7 @@ public org.tensorflow.proto.FeaturesOrBuilder getFeaturesOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.Features, org.tensorflow.proto.Features.Builder, org.tensorflow.proto.FeaturesOrBuilder> 
-        getFeaturesFieldBuilder() {
+        internalGetFeaturesFieldBuilder() {
       if (featuresBuilder_ == null) {
         featuresBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.Features, org.tensorflow.proto.Features.Builder, org.tensorflow.proto.FeaturesOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleOrBuilder.java
index 090e50da446..1f0843d7916 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ExampleOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.Example)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfiguration.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfiguration.java
index a74f6f6df59..fc934df1058 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfiguration.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfiguration.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.ExampleParserConfiguration}
  */
+@com.google.protobuf.Generated
 public final class ExampleParserConfiguration extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ExampleParserConfiguration)
@@ -17,8 +18,8 @@ public final class ExampleParserConfiguration extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ExampleParserConfiguration.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfigurationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfigurationOrBuilder.java
index 1f35e0642bc..3ac9adb8f96 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfigurationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfigurationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ExampleParserConfigurationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ExampleParserConfiguration)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfigurationProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfigurationProtos.java
index 4d14ee3d4b8..ac8699f1db1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfigurationProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleParserConfigurationProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ExampleParserConfigurationProtos {
   private ExampleParserConfigurationProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ExampleParserConfigurationProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleProtos.java
index 46f3017c277..0ff3d47f443 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExampleProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ExampleProtos {
   private ExampleProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ExampleProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Execution.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Execution.java
index 46793096670..62957f78f92 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Execution.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Execution.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -14,6 +14,7 @@
  *
  * Protobuf type {@code tensorflow.Execution}
  */
+@com.google.protobuf.Generated
 public final class Execution extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.Execution)
@@ -23,8 +24,8 @@ public final class Execution extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Execution.class.getName());
   }
@@ -771,8 +772,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorProtosFieldBuilder();
-        getCodeLocationFieldBuilder();
+        internalGetTensorProtosFieldBuilder();
+        internalGetCodeLocationFieldBuilder();
       }
     }
     @java.lang.Override
@@ -948,7 +949,7 @@ public Builder mergeFrom(org.tensorflow.proto.Execution other) {
             bitField0_ = (bitField0_ & ~0x00000040);
             tensorProtosBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getTensorProtosFieldBuilder() : null;
+                 internalGetTensorProtosFieldBuilder() : null;
           } else {
             tensorProtosBuilder_.addAllMessages(other.tensorProtos_);
           }
@@ -1061,7 +1062,7 @@ public Builder mergeFrom(
             } // case 58
             case 66: {
               input.readMessage(
-                  getCodeLocationFieldBuilder().getBuilder(),
+                  internalGetCodeLocationFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000080;
               break;
@@ -1618,9 +1619,7 @@ public org.tensorflow.proto.TensorDebugMode getTensorDebugMode() {
      * @return This builder for chaining.
      */
     public Builder setTensorDebugMode(org.tensorflow.proto.TensorDebugMode value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000020;
       tensorDebugMode_ = value.getNumber();
       onChanged();
@@ -1886,7 +1885,7 @@ public Builder removeTensorProtos(int index) {
      */
     public org.tensorflow.proto.TensorProto.Builder getTensorProtosBuilder(
         int index) {
-      return getTensorProtosFieldBuilder().getBuilder(index);
+      return internalGetTensorProtosFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1928,7 +1927,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorProtosOrBuilder(
      * repeated .tensorflow.TensorProto tensor_protos = 7;
      */
     public org.tensorflow.proto.TensorProto.Builder addTensorProtosBuilder() {
-      return getTensorProtosFieldBuilder().addBuilder(
+      return internalGetTensorProtosFieldBuilder().addBuilder(
           org.tensorflow.proto.TensorProto.getDefaultInstance());
     }
     /**
@@ -1941,7 +1940,7 @@ public org.tensorflow.proto.TensorProto.Builder addTensorProtosBuilder() {
      */
     public org.tensorflow.proto.TensorProto.Builder addTensorProtosBuilder(
         int index) {
-      return getTensorProtosFieldBuilder().addBuilder(
+      return internalGetTensorProtosFieldBuilder().addBuilder(
           index, org.tensorflow.proto.TensorProto.getDefaultInstance());
     }
     /**
@@ -1954,11 +1953,11 @@ public org.tensorflow.proto.TensorProto.Builder addTensorProtosBuilder(
      */
     public java.util.List 
          getTensorProtosBuilderList() {
-      return getTensorProtosFieldBuilder().getBuilderList();
+      return internalGetTensorProtosFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-        getTensorProtosFieldBuilder() {
+        internalGetTensorProtosFieldBuilder() {
       if (tensorProtosBuilder_ == null) {
         tensorProtosBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
@@ -2090,7 +2089,7 @@ public Builder clearCodeLocation() {
     public org.tensorflow.proto.CodeLocation.Builder getCodeLocationBuilder() {
       bitField0_ |= 0x00000080;
       onChanged();
-      return getCodeLocationFieldBuilder().getBuilder();
+      return internalGetCodeLocationFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2116,7 +2115,7 @@ public org.tensorflow.proto.CodeLocationOrBuilder getCodeLocationOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CodeLocation, org.tensorflow.proto.CodeLocation.Builder, org.tensorflow.proto.CodeLocationOrBuilder> 
-        getCodeLocationFieldBuilder() {
+        internalGetCodeLocationFieldBuilder() {
       if (codeLocationBuilder_ == null) {
         codeLocationBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.CodeLocation, org.tensorflow.proto.CodeLocation.Builder, org.tensorflow.proto.CodeLocationOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExecutionOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExecutionOrBuilder.java
index 1e95b376148..77a7e477043 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExecutionOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ExecutionOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ExecutionOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.Execution)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Feature.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Feature.java
index 000c9bda934..d706b797f2c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Feature.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Feature.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.Feature}
  */
+@com.google.protobuf.Generated
 public final class Feature extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.Feature)
@@ -21,8 +22,8 @@ public final class Feature extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Feature.class.getName());
   }
@@ -542,21 +543,21 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getBytesListFieldBuilder().getBuilder(),
+                  internalGetBytesListFieldBuilder().getBuilder(),
                   extensionRegistry);
               kindCase_ = 1;
               break;
             } // case 10
             case 18: {
               input.readMessage(
-                  getFloatListFieldBuilder().getBuilder(),
+                  internalGetFloatListFieldBuilder().getBuilder(),
                   extensionRegistry);
               kindCase_ = 2;
               break;
             } // case 18
             case 26: {
               input.readMessage(
-                  getInt64ListFieldBuilder().getBuilder(),
+                  internalGetInt64ListFieldBuilder().getBuilder(),
                   extensionRegistry);
               kindCase_ = 3;
               break;
@@ -697,7 +698,7 @@ public Builder clearBytesList() {
      * .tensorflow.BytesList bytes_list = 1;
      */
     public org.tensorflow.proto.BytesList.Builder getBytesListBuilder() {
-      return getBytesListFieldBuilder().getBuilder();
+      return internalGetBytesListFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.BytesList bytes_list = 1;
@@ -718,7 +719,7 @@ public org.tensorflow.proto.BytesListOrBuilder getBytesListOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.BytesList, org.tensorflow.proto.BytesList.Builder, org.tensorflow.proto.BytesListOrBuilder> 
-        getBytesListFieldBuilder() {
+        internalGetBytesListFieldBuilder() {
       if (bytesListBuilder_ == null) {
         if (!(kindCase_ == 1)) {
           kind_ = org.tensorflow.proto.BytesList.getDefaultInstance();
@@ -839,7 +840,7 @@ public Builder clearFloatList() {
      * .tensorflow.FloatList float_list = 2;
      */
     public org.tensorflow.proto.FloatList.Builder getFloatListBuilder() {
-      return getFloatListFieldBuilder().getBuilder();
+      return internalGetFloatListFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.FloatList float_list = 2;
@@ -860,7 +861,7 @@ public org.tensorflow.proto.FloatListOrBuilder getFloatListOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.FloatList, org.tensorflow.proto.FloatList.Builder, org.tensorflow.proto.FloatListOrBuilder> 
-        getFloatListFieldBuilder() {
+        internalGetFloatListFieldBuilder() {
       if (floatListBuilder_ == null) {
         if (!(kindCase_ == 2)) {
           kind_ = org.tensorflow.proto.FloatList.getDefaultInstance();
@@ -981,7 +982,7 @@ public Builder clearInt64List() {
      * .tensorflow.Int64List int64_list = 3;
      */
     public org.tensorflow.proto.Int64List.Builder getInt64ListBuilder() {
-      return getInt64ListFieldBuilder().getBuilder();
+      return internalGetInt64ListFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.Int64List int64_list = 3;
@@ -1002,7 +1003,7 @@ public org.tensorflow.proto.Int64ListOrBuilder getInt64ListOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.Int64List, org.tensorflow.proto.Int64List.Builder, org.tensorflow.proto.Int64ListOrBuilder> 
-        getInt64ListFieldBuilder() {
+        internalGetInt64ListFieldBuilder() {
       if (int64ListBuilder_ == null) {
         if (!(kindCase_ == 3)) {
           kind_ = org.tensorflow.proto.Int64List.getDefaultInstance();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureConfiguration.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureConfiguration.java
index 98a591ecedb..fc684bbc742 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureConfiguration.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureConfiguration.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.FeatureConfiguration}
  */
+@com.google.protobuf.Generated
 public final class FeatureConfiguration extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FeatureConfiguration)
@@ -17,8 +18,8 @@ public final class FeatureConfiguration extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FeatureConfiguration.class.getName());
   }
@@ -475,14 +476,14 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getFixedLenFeatureFieldBuilder().getBuilder(),
+                  internalGetFixedLenFeatureFieldBuilder().getBuilder(),
                   extensionRegistry);
               configCase_ = 1;
               break;
             } // case 10
             case 18: {
               input.readMessage(
-                  getVarLenFeatureFieldBuilder().getBuilder(),
+                  internalGetVarLenFeatureFieldBuilder().getBuilder(),
                   extensionRegistry);
               configCase_ = 2;
               break;
@@ -623,7 +624,7 @@ public Builder clearFixedLenFeature() {
      * .tensorflow.FixedLenFeatureProto fixed_len_feature = 1;
      */
     public org.tensorflow.proto.FixedLenFeatureProto.Builder getFixedLenFeatureBuilder() {
-      return getFixedLenFeatureFieldBuilder().getBuilder();
+      return internalGetFixedLenFeatureFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.FixedLenFeatureProto fixed_len_feature = 1;
@@ -644,7 +645,7 @@ public org.tensorflow.proto.FixedLenFeatureProtoOrBuilder getFixedLenFeatureOrBu
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.FixedLenFeatureProto, org.tensorflow.proto.FixedLenFeatureProto.Builder, org.tensorflow.proto.FixedLenFeatureProtoOrBuilder> 
-        getFixedLenFeatureFieldBuilder() {
+        internalGetFixedLenFeatureFieldBuilder() {
       if (fixedLenFeatureBuilder_ == null) {
         if (!(configCase_ == 1)) {
           config_ = org.tensorflow.proto.FixedLenFeatureProto.getDefaultInstance();
@@ -765,7 +766,7 @@ public Builder clearVarLenFeature() {
      * .tensorflow.VarLenFeatureProto var_len_feature = 2;
      */
     public org.tensorflow.proto.VarLenFeatureProto.Builder getVarLenFeatureBuilder() {
-      return getVarLenFeatureFieldBuilder().getBuilder();
+      return internalGetVarLenFeatureFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.VarLenFeatureProto var_len_feature = 2;
@@ -786,7 +787,7 @@ public org.tensorflow.proto.VarLenFeatureProtoOrBuilder getVarLenFeatureOrBuilde
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.VarLenFeatureProto, org.tensorflow.proto.VarLenFeatureProto.Builder, org.tensorflow.proto.VarLenFeatureProtoOrBuilder> 
-        getVarLenFeatureFieldBuilder() {
+        internalGetVarLenFeatureFieldBuilder() {
       if (varLenFeatureBuilder_ == null) {
         if (!(configCase_ == 2)) {
           config_ = org.tensorflow.proto.VarLenFeatureProto.getDefaultInstance();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureConfigurationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureConfigurationOrBuilder.java
index 7b6b97b7815..dc99e9be9c2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureConfigurationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureConfigurationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FeatureConfigurationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FeatureConfiguration)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureList.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureList.java
index ee7c362045d..0e4713576a6 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureList.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureList.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -18,6 +18,7 @@
  *
  * Protobuf type {@code tensorflow.FeatureList}
  */
+@com.google.protobuf.Generated
 public final class FeatureList extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FeatureList)
@@ -27,8 +28,8 @@ public final class FeatureList extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FeatureList.class.getName());
   }
@@ -384,7 +385,7 @@ public Builder mergeFrom(org.tensorflow.proto.FeatureList other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             featureBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getFeatureFieldBuilder() : null;
+                 internalGetFeatureFieldBuilder() : null;
           } else {
             featureBuilder_.addAllMessages(other.feature_);
           }
@@ -626,7 +627,7 @@ public Builder removeFeature(int index) {
      */
     public org.tensorflow.proto.Feature.Builder getFeatureBuilder(
         int index) {
-      return getFeatureFieldBuilder().getBuilder(index);
+      return internalGetFeatureFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.Feature feature = 1;
@@ -653,7 +654,7 @@ public org.tensorflow.proto.FeatureOrBuilder getFeatureOrBuilder(
      * repeated .tensorflow.Feature feature = 1;
      */
     public org.tensorflow.proto.Feature.Builder addFeatureBuilder() {
-      return getFeatureFieldBuilder().addBuilder(
+      return internalGetFeatureFieldBuilder().addBuilder(
           org.tensorflow.proto.Feature.getDefaultInstance());
     }
     /**
@@ -661,7 +662,7 @@ public org.tensorflow.proto.Feature.Builder addFeatureBuilder() {
      */
     public org.tensorflow.proto.Feature.Builder addFeatureBuilder(
         int index) {
-      return getFeatureFieldBuilder().addBuilder(
+      return internalGetFeatureFieldBuilder().addBuilder(
           index, org.tensorflow.proto.Feature.getDefaultInstance());
     }
     /**
@@ -669,11 +670,11 @@ public org.tensorflow.proto.Feature.Builder addFeatureBuilder(
      */
     public java.util.List 
          getFeatureBuilderList() {
-      return getFeatureFieldBuilder().getBuilderList();
+      return internalGetFeatureFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.Feature, org.tensorflow.proto.Feature.Builder, org.tensorflow.proto.FeatureOrBuilder> 
-        getFeatureFieldBuilder() {
+        internalGetFeatureFieldBuilder() {
       if (featureBuilder_ == null) {
         featureBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.Feature, org.tensorflow.proto.Feature.Builder, org.tensorflow.proto.FeatureOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureListOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureListOrBuilder.java
index c777d2f0a4d..af771775506 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureListOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureListOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FeatureListOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FeatureList)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureLists.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureLists.java
index f69d92ebbcb..9efbe19fe5d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureLists.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureLists.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.FeatureLists}
  */
+@com.google.protobuf.Generated
 public final class FeatureLists extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FeatureLists)
@@ -17,8 +18,8 @@ public final class FeatureLists extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FeatureLists.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureListsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureListsOrBuilder.java
index d42e63918ef..cd690175ece 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureListsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureListsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FeatureListsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FeatureLists)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureOrBuilder.java
index 04375d60edf..d9027454c79 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FeatureOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.Feature)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureProtos.java
index 056432bdb1a..30f5cc4ded1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeatureProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class FeatureProtos {
   private FeatureProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FeatureProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Features.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Features.java
index 09565c43a05..5e649f2f1c2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Features.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Features.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.Features}
  */
+@com.google.protobuf.Generated
 public final class Features extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.Features)
@@ -17,8 +18,8 @@ public final class Features extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Features.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeaturesOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeaturesOrBuilder.java
index ccc86b2da95..6ce738f7dc3 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeaturesOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FeaturesOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FeaturesOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.Features)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintDef.java
index d26cf3ac830..e9879da74df 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/fingerprint.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -15,6 +15,7 @@
  *
  * Protobuf type {@code tensorflow.FingerprintDef}
  */
+@com.google.protobuf.Generated
 public final class FingerprintDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FingerprintDef)
@@ -24,8 +25,8 @@ public final class FingerprintDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FingerprintDef.class.getName());
   }
@@ -483,7 +484,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getVersionFieldBuilder();
+        internalGetVersionFieldBuilder();
       }
     }
     @java.lang.Override
@@ -650,7 +651,7 @@ public Builder mergeFrom(
             } // case 40
             case 50: {
               input.readMessage(
-                  getVersionFieldBuilder().getBuilder(),
+                  internalGetVersionFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000040;
               break;
@@ -1108,7 +1109,7 @@ public Builder clearVersion() {
     public org.tensorflow.proto.VersionDef.Builder getVersionBuilder() {
       bitField0_ |= 0x00000040;
       onChanged();
-      return getVersionFieldBuilder().getBuilder();
+      return internalGetVersionFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1134,7 +1135,7 @@ public org.tensorflow.proto.VersionDefOrBuilder getVersionOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder> 
-        getVersionFieldBuilder() {
+        internalGetVersionFieldBuilder() {
       if (versionBuilder_ == null) {
         versionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintDefOrBuilder.java
index 1dc0c870f7d..a99b0af331f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/fingerprint.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FingerprintDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FingerprintDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintProtos.java
index 734b9b30e63..be59b539b1f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FingerprintProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/fingerprint.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class FingerprintProtos {
   private FingerprintProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FingerprintProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FixedLenFeatureProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FixedLenFeatureProto.java
index 70708dadbba..67af2093b60 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FixedLenFeatureProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FixedLenFeatureProto.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.FixedLenFeatureProto}
  */
+@com.google.protobuf.Generated
 public final class FixedLenFeatureProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FixedLenFeatureProto)
@@ -17,8 +18,8 @@ public final class FixedLenFeatureProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FixedLenFeatureProto.class.getName());
   }
@@ -385,8 +386,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getShapeFieldBuilder();
-        getDefaultValueFieldBuilder();
+        internalGetShapeFieldBuilder();
+        internalGetDefaultValueFieldBuilder();
       }
     }
     @java.lang.Override
@@ -519,14 +520,14 @@ public Builder mergeFrom(
             } // case 8
             case 18: {
               input.readMessage(
-                  getShapeFieldBuilder().getBuilder(),
+                  internalGetShapeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
             } // case 18
             case 26: {
               input.readMessage(
-                  getDefaultValueFieldBuilder().getBuilder(),
+                  internalGetDefaultValueFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
@@ -587,9 +588,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       dtype_ = value.getNumber();
       onChanged();
@@ -697,7 +696,7 @@ public Builder clearShape() {
     public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getShapeFieldBuilder().getBuilder();
+      return internalGetShapeFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.TensorShapeProto shape = 2;
@@ -715,7 +714,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-        getShapeFieldBuilder() {
+        internalGetShapeFieldBuilder() {
       if (shapeBuilder_ == null) {
         shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -818,7 +817,7 @@ public Builder clearDefaultValue() {
     public org.tensorflow.proto.TensorProto.Builder getDefaultValueBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getDefaultValueFieldBuilder().getBuilder();
+      return internalGetDefaultValueFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.TensorProto default_value = 3;
@@ -836,7 +835,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getDefaultValueOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-        getDefaultValueFieldBuilder() {
+        internalGetDefaultValueFieldBuilder() {
       if (defaultValueBuilder_ == null) {
         defaultValueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FixedLenFeatureProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FixedLenFeatureProtoOrBuilder.java
index e49042cfcae..b77c144a866 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FixedLenFeatureProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FixedLenFeatureProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FixedLenFeatureProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FixedLenFeatureProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FloatList.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FloatList.java
index 5997a988c59..3bc26b42509 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FloatList.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FloatList.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.FloatList}
  */
+@com.google.protobuf.Generated
 public final class FloatList extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FloatList)
@@ -17,8 +18,8 @@ public final class FloatList extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FloatList.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FloatListOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FloatListOrBuilder.java
index 3a09beb22bb..b78de4b90be 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FloatListOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FloatListOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FloatListOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FloatList)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeDef.java
index 52b9cac7116..d841e4d94d2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/full_type.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -15,6 +15,7 @@
  *
  * Protobuf type {@code tensorflow.FullTypeDef}
  */
+@com.google.protobuf.Generated
 public final class FullTypeDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FullTypeDef)
@@ -24,8 +25,8 @@ public final class FullTypeDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FullTypeDef.class.getName());
   }
@@ -598,7 +599,7 @@ public Builder mergeFrom(org.tensorflow.proto.FullTypeDef other) {
             bitField0_ = (bitField0_ & ~0x00000002);
             argsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getArgsFieldBuilder() : null;
+                 internalGetArgsFieldBuilder() : null;
           } else {
             argsBuilder_.addAllMessages(other.args_);
           }
@@ -764,9 +765,7 @@ public org.tensorflow.proto.FullTypeId getTypeId() {
      * @return This builder for chaining.
      */
     public Builder setTypeId(org.tensorflow.proto.FullTypeId value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       typeId_ = value.getNumber();
       onChanged();
@@ -969,7 +968,7 @@ public Builder removeArgs(int index) {
      */
     public org.tensorflow.proto.FullTypeDef.Builder getArgsBuilder(
         int index) {
-      return getArgsFieldBuilder().getBuilder(index);
+      return internalGetArgsFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.FullTypeDef args = 2;
@@ -996,7 +995,7 @@ public org.tensorflow.proto.FullTypeDefOrBuilder getArgsOrBuilder(
      * repeated .tensorflow.FullTypeDef args = 2;
      */
     public org.tensorflow.proto.FullTypeDef.Builder addArgsBuilder() {
-      return getArgsFieldBuilder().addBuilder(
+      return internalGetArgsFieldBuilder().addBuilder(
           org.tensorflow.proto.FullTypeDef.getDefaultInstance());
     }
     /**
@@ -1004,7 +1003,7 @@ public org.tensorflow.proto.FullTypeDef.Builder addArgsBuilder() {
      */
     public org.tensorflow.proto.FullTypeDef.Builder addArgsBuilder(
         int index) {
-      return getArgsFieldBuilder().addBuilder(
+      return internalGetArgsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.FullTypeDef.getDefaultInstance());
     }
     /**
@@ -1012,11 +1011,11 @@ public org.tensorflow.proto.FullTypeDef.Builder addArgsBuilder(
      */
     public java.util.List 
          getArgsBuilderList() {
-      return getArgsFieldBuilder().getBuilderList();
+      return internalGetArgsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.FullTypeDef, org.tensorflow.proto.FullTypeDef.Builder, org.tensorflow.proto.FullTypeDefOrBuilder> 
-        getArgsFieldBuilder() {
+        internalGetArgsFieldBuilder() {
       if (argsBuilder_ == null) {
         argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.FullTypeDef, org.tensorflow.proto.FullTypeDef.Builder, org.tensorflow.proto.FullTypeDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeDefOrBuilder.java
index 7c071d4dcde..567d68d0f41 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/full_type.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FullTypeDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FullTypeDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeId.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeId.java
index 5f532bfd4e5..4ddb172107b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeId.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeId.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/full_type.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf enum {@code tensorflow.FullTypeId}
  */
+@com.google.protobuf.Generated
 public enum FullTypeId
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -428,8 +429,8 @@ public enum FullTypeId
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FullTypeId.class.getName());
   }
@@ -927,7 +928,7 @@ public FullTypeId findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.FullTypeProtos.getDescriptor().getEnumTypes().get(0);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeProtos.java
index 83bd2f467bd..a4c611a87b4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FullTypeProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/full_type.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class FullTypeProtos {
   private FullTypeProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FullTypeProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDef.java
index aa45a3eb8d2..7f3a766b3c9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -17,6 +17,7 @@
  *
  * Protobuf type {@code tensorflow.FunctionDef}
  */
+@com.google.protobuf.Generated
 public final class FunctionDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FunctionDef)
@@ -26,8 +27,8 @@ public final class FunctionDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FunctionDef.class.getName());
   }
@@ -127,8 +128,8 @@ public static final class ArgAttrs extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ArgAttrs.class.getName());
     }
@@ -1759,8 +1760,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getSignatureFieldBuilder();
-        getNodeDefFieldBuilder();
+        internalGetSignatureFieldBuilder();
+        internalGetNodeDefFieldBuilder();
       }
     }
     @java.lang.Override
@@ -1902,7 +1903,7 @@ public Builder mergeFrom(org.tensorflow.proto.FunctionDef other) {
             bitField0_ = (bitField0_ & ~0x00000010);
             nodeDefBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNodeDefFieldBuilder() : null;
+                 internalGetNodeDefFieldBuilder() : null;
           } else {
             nodeDefBuilder_.addAllMessages(other.nodeDef_);
           }
@@ -1942,7 +1943,7 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getSignatureFieldBuilder().getBuilder(),
+                  internalGetSignatureFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
@@ -2148,7 +2149,7 @@ public Builder clearSignature() {
     public org.tensorflow.proto.OpDef.Builder getSignatureBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getSignatureFieldBuilder().getBuilder();
+      return internalGetSignatureFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2176,7 +2177,7 @@ public org.tensorflow.proto.OpDefOrBuilder getSignatureOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.OpDef, org.tensorflow.proto.OpDef.Builder, org.tensorflow.proto.OpDefOrBuilder> 
-        getSignatureFieldBuilder() {
+        internalGetSignatureFieldBuilder() {
       if (signatureBuilder_ == null) {
         signatureBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.OpDef, org.tensorflow.proto.OpDef.Builder, org.tensorflow.proto.OpDefOrBuilder>(
@@ -2997,7 +2998,7 @@ public Builder removeNodeDef(int index) {
      */
     public org.tensorflow.proto.NodeDef.Builder getNodeDefBuilder(
         int index) {
-      return getNodeDefFieldBuilder().getBuilder(index);
+      return internalGetNodeDefFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -3042,7 +3043,7 @@ public org.tensorflow.proto.NodeDefOrBuilder getNodeDefOrBuilder(
      * repeated .tensorflow.NodeDef node_def = 3;
      */
     public org.tensorflow.proto.NodeDef.Builder addNodeDefBuilder() {
-      return getNodeDefFieldBuilder().addBuilder(
+      return internalGetNodeDefFieldBuilder().addBuilder(
           org.tensorflow.proto.NodeDef.getDefaultInstance());
     }
     /**
@@ -3056,7 +3057,7 @@ public org.tensorflow.proto.NodeDef.Builder addNodeDefBuilder() {
      */
     public org.tensorflow.proto.NodeDef.Builder addNodeDefBuilder(
         int index) {
-      return getNodeDefFieldBuilder().addBuilder(
+      return internalGetNodeDefFieldBuilder().addBuilder(
           index, org.tensorflow.proto.NodeDef.getDefaultInstance());
     }
     /**
@@ -3070,11 +3071,11 @@ public org.tensorflow.proto.NodeDef.Builder addNodeDefBuilder(
      */
     public java.util.List 
          getNodeDefBuilderList() {
-      return getNodeDefFieldBuilder().getBuilderList();
+      return internalGetNodeDefFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.NodeDef, org.tensorflow.proto.NodeDef.Builder, org.tensorflow.proto.NodeDefOrBuilder> 
-        getNodeDefFieldBuilder() {
+        internalGetNodeDefFieldBuilder() {
       if (nodeDefBuilder_ == null) {
         nodeDefBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.NodeDef, org.tensorflow.proto.NodeDef.Builder, org.tensorflow.proto.NodeDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefLibrary.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefLibrary.java
index 13f92728ca4..8d6264b2a50 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefLibrary.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefLibrary.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.FunctionDefLibrary}
  */
+@com.google.protobuf.Generated
 public final class FunctionDefLibrary extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.FunctionDefLibrary)
@@ -21,8 +22,8 @@ public final class FunctionDefLibrary extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FunctionDefLibrary.class.getName());
   }
@@ -514,7 +515,7 @@ public Builder mergeFrom(org.tensorflow.proto.FunctionDefLibrary other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             functionBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getFunctionFieldBuilder() : null;
+                 internalGetFunctionFieldBuilder() : null;
           } else {
             functionBuilder_.addAllMessages(other.function_);
           }
@@ -540,7 +541,7 @@ public Builder mergeFrom(org.tensorflow.proto.FunctionDefLibrary other) {
             bitField0_ = (bitField0_ & ~0x00000002);
             gradientBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getGradientFieldBuilder() : null;
+                 internalGetGradientFieldBuilder() : null;
           } else {
             gradientBuilder_.addAllMessages(other.gradient_);
           }
@@ -566,7 +567,7 @@ public Builder mergeFrom(org.tensorflow.proto.FunctionDefLibrary other) {
             bitField0_ = (bitField0_ & ~0x00000004);
             registeredGradientsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getRegisteredGradientsFieldBuilder() : null;
+                 internalGetRegisteredGradientsFieldBuilder() : null;
           } else {
             registeredGradientsBuilder_.addAllMessages(other.registeredGradients_);
           }
@@ -834,7 +835,7 @@ public Builder removeFunction(int index) {
      */
     public org.tensorflow.proto.FunctionDef.Builder getFunctionBuilder(
         int index) {
-      return getFunctionFieldBuilder().getBuilder(index);
+      return internalGetFunctionFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.FunctionDef function = 1;
@@ -861,7 +862,7 @@ public org.tensorflow.proto.FunctionDefOrBuilder getFunctionOrBuilder(
      * repeated .tensorflow.FunctionDef function = 1;
      */
     public org.tensorflow.proto.FunctionDef.Builder addFunctionBuilder() {
-      return getFunctionFieldBuilder().addBuilder(
+      return internalGetFunctionFieldBuilder().addBuilder(
           org.tensorflow.proto.FunctionDef.getDefaultInstance());
     }
     /**
@@ -869,7 +870,7 @@ public org.tensorflow.proto.FunctionDef.Builder addFunctionBuilder() {
      */
     public org.tensorflow.proto.FunctionDef.Builder addFunctionBuilder(
         int index) {
-      return getFunctionFieldBuilder().addBuilder(
+      return internalGetFunctionFieldBuilder().addBuilder(
           index, org.tensorflow.proto.FunctionDef.getDefaultInstance());
     }
     /**
@@ -877,11 +878,11 @@ public org.tensorflow.proto.FunctionDef.Builder addFunctionBuilder(
      */
     public java.util.List 
          getFunctionBuilderList() {
-      return getFunctionFieldBuilder().getBuilderList();
+      return internalGetFunctionFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.FunctionDef, org.tensorflow.proto.FunctionDef.Builder, org.tensorflow.proto.FunctionDefOrBuilder> 
-        getFunctionFieldBuilder() {
+        internalGetFunctionFieldBuilder() {
       if (functionBuilder_ == null) {
         functionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.FunctionDef, org.tensorflow.proto.FunctionDef.Builder, org.tensorflow.proto.FunctionDefOrBuilder>(
@@ -1074,7 +1075,7 @@ public Builder removeGradient(int index) {
      */
     public org.tensorflow.proto.GradientDef.Builder getGradientBuilder(
         int index) {
-      return getGradientFieldBuilder().getBuilder(index);
+      return internalGetGradientFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.GradientDef gradient = 2;
@@ -1101,7 +1102,7 @@ public org.tensorflow.proto.GradientDefOrBuilder getGradientOrBuilder(
      * repeated .tensorflow.GradientDef gradient = 2;
      */
     public org.tensorflow.proto.GradientDef.Builder addGradientBuilder() {
-      return getGradientFieldBuilder().addBuilder(
+      return internalGetGradientFieldBuilder().addBuilder(
           org.tensorflow.proto.GradientDef.getDefaultInstance());
     }
     /**
@@ -1109,7 +1110,7 @@ public org.tensorflow.proto.GradientDef.Builder addGradientBuilder() {
      */
     public org.tensorflow.proto.GradientDef.Builder addGradientBuilder(
         int index) {
-      return getGradientFieldBuilder().addBuilder(
+      return internalGetGradientFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GradientDef.getDefaultInstance());
     }
     /**
@@ -1117,11 +1118,11 @@ public org.tensorflow.proto.GradientDef.Builder addGradientBuilder(
      */
     public java.util.List 
          getGradientBuilderList() {
-      return getGradientFieldBuilder().getBuilderList();
+      return internalGetGradientFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GradientDef, org.tensorflow.proto.GradientDef.Builder, org.tensorflow.proto.GradientDefOrBuilder> 
-        getGradientFieldBuilder() {
+        internalGetGradientFieldBuilder() {
       if (gradientBuilder_ == null) {
         gradientBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GradientDef, org.tensorflow.proto.GradientDef.Builder, org.tensorflow.proto.GradientDefOrBuilder>(
@@ -1314,7 +1315,7 @@ public Builder removeRegisteredGradients(int index) {
      */
     public org.tensorflow.proto.RegisteredGradient.Builder getRegisteredGradientsBuilder(
         int index) {
-      return getRegisteredGradientsFieldBuilder().getBuilder(index);
+      return internalGetRegisteredGradientsFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.RegisteredGradient registered_gradients = 3;
@@ -1341,7 +1342,7 @@ public org.tensorflow.proto.RegisteredGradientOrBuilder getRegisteredGradientsOr
      * repeated .tensorflow.RegisteredGradient registered_gradients = 3;
      */
     public org.tensorflow.proto.RegisteredGradient.Builder addRegisteredGradientsBuilder() {
-      return getRegisteredGradientsFieldBuilder().addBuilder(
+      return internalGetRegisteredGradientsFieldBuilder().addBuilder(
           org.tensorflow.proto.RegisteredGradient.getDefaultInstance());
     }
     /**
@@ -1349,7 +1350,7 @@ public org.tensorflow.proto.RegisteredGradient.Builder addRegisteredGradientsBui
      */
     public org.tensorflow.proto.RegisteredGradient.Builder addRegisteredGradientsBuilder(
         int index) {
-      return getRegisteredGradientsFieldBuilder().addBuilder(
+      return internalGetRegisteredGradientsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.RegisteredGradient.getDefaultInstance());
     }
     /**
@@ -1357,11 +1358,11 @@ public org.tensorflow.proto.RegisteredGradient.Builder addRegisteredGradientsBui
      */
     public java.util.List 
          getRegisteredGradientsBuilderList() {
-      return getRegisteredGradientsFieldBuilder().getBuilderList();
+      return internalGetRegisteredGradientsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.RegisteredGradient, org.tensorflow.proto.RegisteredGradient.Builder, org.tensorflow.proto.RegisteredGradientOrBuilder> 
-        getRegisteredGradientsFieldBuilder() {
+        internalGetRegisteredGradientsFieldBuilder() {
       if (registeredGradientsBuilder_ == null) {
         registeredGradientsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.RegisteredGradient, org.tensorflow.proto.RegisteredGradient.Builder, org.tensorflow.proto.RegisteredGradientOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefLibraryOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefLibraryOrBuilder.java
index 5dfb6aefc69..d937e48c9df 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefLibraryOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefLibraryOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FunctionDefLibraryOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FunctionDefLibrary)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefOrBuilder.java
index cd87f92a585..c44dec7f9a7 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface FunctionDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.FunctionDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionProtos.java
index 202accf0318..311c14a2c07 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/FunctionProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class FunctionProtos {
   private FunctionProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       FunctionProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUInfo.java
index 32cf218ca81..ddef9651a3e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GPUInfo}
  */
+@com.google.protobuf.Generated
 public final class GPUInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GPUInfo)
@@ -17,8 +18,8 @@ public final class GPUInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GPUInfo.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUInfoOrBuilder.java
index 0520a0f68fb..dbc920fd741 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GPUInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GPUInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUOptions.java
index b63a758033d..f9fc065f8d2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUOptions.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GPUOptions}
  */
+@com.google.protobuf.Generated
 public final class GPUOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GPUOptions)
@@ -17,8 +18,8 @@ public final class GPUOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GPUOptions.class.getName());
   }
@@ -533,8 +534,8 @@ public static final class Experimental extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Experimental.class.getName());
     }
@@ -725,8 +726,8 @@ public static final class VirtualDevices extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           VirtualDevices.class.getName());
       }
@@ -1978,8 +1979,8 @@ public static final class StreamMergeOptions extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           StreamMergeOptions.class.getName());
       }
@@ -3619,8 +3620,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getVirtualDevicesFieldBuilder();
-          getStreamMergeOptionsFieldBuilder();
+          internalGetVirtualDevicesFieldBuilder();
+          internalGetStreamMergeOptionsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -3791,7 +3792,7 @@ public Builder mergeFrom(org.tensorflow.proto.GPUOptions.Experimental other) {
               bitField0_ = (bitField0_ & ~0x00000001);
               virtualDevicesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getVirtualDevicesFieldBuilder() : null;
+                   internalGetVirtualDevicesFieldBuilder() : null;
             } else {
               virtualDevicesBuilder_.addAllMessages(other.virtualDevices_);
             }
@@ -3823,7 +3824,7 @@ public Builder mergeFrom(org.tensorflow.proto.GPUOptions.Experimental other) {
         if (other.getKernelTrackerMaxPending() != 0) {
           setKernelTrackerMaxPending(other.getKernelTrackerMaxPending());
         }
-        if (other.getInternalFragmentationFraction() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getInternalFragmentationFraction()) != 0) {
           setInternalFragmentationFraction(other.getInternalFragmentationFraction());
         }
         if (other.getUseCudaMallocAsync() != false) {
@@ -3832,7 +3833,7 @@ public Builder mergeFrom(org.tensorflow.proto.GPUOptions.Experimental other) {
         if (other.getDisallowRetryOnAllocationFailure() != false) {
           setDisallowRetryOnAllocationFailure(other.getDisallowRetryOnAllocationFailure());
         }
-        if (other.getGpuHostMemLimitInMb() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getGpuHostMemLimitInMb()) != 0) {
           setGpuHostMemLimitInMb(other.getGpuHostMemLimitInMb());
         }
         if (other.getGpuHostMemDisallowGrowth() != false) {
@@ -3971,7 +3972,7 @@ public Builder mergeFrom(
               } // case 144
               case 154: {
                 input.readMessage(
-                    getStreamMergeOptionsFieldBuilder().getBuilder(),
+                    internalGetStreamMergeOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00020000;
                 break;
@@ -4706,7 +4707,7 @@ public Builder removeVirtualDevices(int index) {
        */
       public org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.Builder getVirtualDevicesBuilder(
           int index) {
-        return getVirtualDevicesFieldBuilder().getBuilder(index);
+        return internalGetVirtualDevicesFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -4856,7 +4857,7 @@ public org.tensorflow.proto.GPUOptions.Experimental.VirtualDevicesOrBuilder getV
        * repeated .tensorflow.GPUOptions.Experimental.VirtualDevices virtual_devices = 1;
        */
       public org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.Builder addVirtualDevicesBuilder() {
-        return getVirtualDevicesFieldBuilder().addBuilder(
+        return internalGetVirtualDevicesFieldBuilder().addBuilder(
             org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.getDefaultInstance());
       }
       /**
@@ -4905,7 +4906,7 @@ public org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.Builder addVi
        */
       public org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.Builder addVirtualDevicesBuilder(
           int index) {
-        return getVirtualDevicesFieldBuilder().addBuilder(
+        return internalGetVirtualDevicesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.getDefaultInstance());
       }
       /**
@@ -4954,11 +4955,11 @@ public org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.Builder addVi
        */
       public java.util.List 
            getVirtualDevicesBuilderList() {
-        return getVirtualDevicesFieldBuilder().getBuilderList();
+        return internalGetVirtualDevicesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices, org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.Builder, org.tensorflow.proto.GPUOptions.Experimental.VirtualDevicesOrBuilder> 
-          getVirtualDevicesFieldBuilder() {
+          internalGetVirtualDevicesFieldBuilder() {
         if (virtualDevicesBuilder_ == null) {
           virtualDevicesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices, org.tensorflow.proto.GPUOptions.Experimental.VirtualDevices.Builder, org.tensorflow.proto.GPUOptions.Experimental.VirtualDevicesOrBuilder>(
@@ -5986,7 +5987,7 @@ public Builder clearStreamMergeOptions() {
       public org.tensorflow.proto.GPUOptions.Experimental.StreamMergeOptions.Builder getStreamMergeOptionsBuilder() {
         bitField0_ |= 0x00020000;
         onChanged();
-        return getStreamMergeOptionsFieldBuilder().getBuilder();
+        return internalGetStreamMergeOptionsFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.GPUOptions.Experimental.StreamMergeOptions stream_merge_options = 19;
@@ -6004,7 +6005,7 @@ public org.tensorflow.proto.GPUOptions.Experimental.StreamMergeOptionsOrBuilder
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.GPUOptions.Experimental.StreamMergeOptions, org.tensorflow.proto.GPUOptions.Experimental.StreamMergeOptions.Builder, org.tensorflow.proto.GPUOptions.Experimental.StreamMergeOptionsOrBuilder> 
-          getStreamMergeOptionsFieldBuilder() {
+          internalGetStreamMergeOptionsFieldBuilder() {
         if (streamMergeOptionsBuilder_ == null) {
           streamMergeOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.GPUOptions.Experimental.StreamMergeOptions, org.tensorflow.proto.GPUOptions.Experimental.StreamMergeOptions.Builder, org.tensorflow.proto.GPUOptions.Experimental.StreamMergeOptionsOrBuilder>(
@@ -6676,7 +6677,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getExperimentalFieldBuilder();
+        internalGetExperimentalFieldBuilder();
       }
     }
     @java.lang.Override
@@ -6775,7 +6776,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(org.tensorflow.proto.GPUOptions other) {
       if (other == org.tensorflow.proto.GPUOptions.getDefaultInstance()) return this;
-      if (other.getPerProcessGpuMemoryFraction() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getPerProcessGpuMemoryFraction()) != 0) {
         setPerProcessGpuMemoryFraction(other.getPerProcessGpuMemoryFraction());
       }
       if (other.getAllowGrowth() != false) {
@@ -6874,7 +6875,7 @@ public Builder mergeFrom(
             } // case 64
             case 74: {
               input.readMessage(
-                  getExperimentalFieldBuilder().getBuilder(),
+                  internalGetExperimentalFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000100;
               break;
@@ -7727,7 +7728,7 @@ public Builder clearExperimental() {
     public org.tensorflow.proto.GPUOptions.Experimental.Builder getExperimentalBuilder() {
       bitField0_ |= 0x00000100;
       onChanged();
-      return getExperimentalFieldBuilder().getBuilder();
+      return internalGetExperimentalFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -7757,7 +7758,7 @@ public org.tensorflow.proto.GPUOptions.ExperimentalOrBuilder getExperimentalOrBu
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GPUOptions.Experimental, org.tensorflow.proto.GPUOptions.Experimental.Builder, org.tensorflow.proto.GPUOptions.ExperimentalOrBuilder> 
-        getExperimentalFieldBuilder() {
+        internalGetExperimentalFieldBuilder() {
       if (experimentalBuilder_ == null) {
         experimentalBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.GPUOptions.Experimental, org.tensorflow.proto.GPUOptions.Experimental.Builder, org.tensorflow.proto.GPUOptions.ExperimentalOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUOptionsOrBuilder.java
index a1d86d2d9c9..b336fa861cd 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GPUOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GPUOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GPUOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GradientDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GradientDef.java
index c7c4781cb88..50f6dd2f0fc 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GradientDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GradientDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -29,6 +29,7 @@
  *
  * Protobuf type {@code tensorflow.GradientDef}
  */
+@com.google.protobuf.Generated
 public final class GradientDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GradientDef)
@@ -38,8 +39,8 @@ public final class GradientDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GradientDef.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GradientDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GradientDefOrBuilder.java
index 4d6181be00b..5f60d84e00f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GradientDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GradientDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GradientDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GradientDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfo.java
index 0c193e2f6eb..2122b658714 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_debug_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphDebugInfo}
  */
+@com.google.protobuf.Generated
 public final class GraphDebugInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphDebugInfo)
@@ -17,8 +18,8 @@ public final class GraphDebugInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphDebugInfo.class.getName());
   }
@@ -199,8 +200,8 @@ public static final class FileLineCol extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         FileLineCol.class.getName());
     }
@@ -1367,8 +1368,8 @@ public static final class StackTrace extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         StackTrace.class.getName());
     }
@@ -1799,7 +1800,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphDebugInfo.StackTrace other) {
               bitField0_ = (bitField0_ & ~0x00000001);
               fileLineColsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getFileLineColsFieldBuilder() : null;
+                   internalGetFileLineColsFieldBuilder() : null;
             } else {
               fileLineColsBuilder_.addAllMessages(other.fileLineCols_);
             }
@@ -2121,7 +2122,7 @@ public Builder removeFileLineCols(int index) {
        */
       public org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder getFileLineColsBuilder(
           int index) {
-        return getFileLineColsFieldBuilder().getBuilder(index);
+        return internalGetFileLineColsFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -2160,7 +2161,7 @@ public org.tensorflow.proto.GraphDebugInfo.FileLineColOrBuilder getFileLineColsO
        * repeated .tensorflow.GraphDebugInfo.FileLineCol file_line_cols = 1;
        */
       public org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder addFileLineColsBuilder() {
-        return getFileLineColsFieldBuilder().addBuilder(
+        return internalGetFileLineColsFieldBuilder().addBuilder(
             org.tensorflow.proto.GraphDebugInfo.FileLineCol.getDefaultInstance());
       }
       /**
@@ -2172,7 +2173,7 @@ public org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder addFileLineColsBu
        */
       public org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder addFileLineColsBuilder(
           int index) {
-        return getFileLineColsFieldBuilder().addBuilder(
+        return internalGetFileLineColsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.GraphDebugInfo.FileLineCol.getDefaultInstance());
       }
       /**
@@ -2184,11 +2185,11 @@ public org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder addFileLineColsBu
        */
       public java.util.List 
            getFileLineColsBuilderList() {
-        return getFileLineColsFieldBuilder().getBuilderList();
+        return internalGetFileLineColsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.GraphDebugInfo.FileLineCol, org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder, org.tensorflow.proto.GraphDebugInfo.FileLineColOrBuilder> 
-          getFileLineColsFieldBuilder() {
+          internalGetFileLineColsFieldBuilder() {
         if (fileLineColsBuilder_ == null) {
           fileLineColsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.GraphDebugInfo.FileLineCol, org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder, org.tensorflow.proto.GraphDebugInfo.FileLineColOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfoOrBuilder.java
index 1219fa49740..d240fd75f73 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_debug_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphDebugInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphDebugInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfoProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfoProtos.java
index 65504f7b57b..3b34271c634 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfoProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDebugInfoProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_debug_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class GraphDebugInfoProtos {
   private GraphDebugInfoProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphDebugInfoProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDef.java
index 412913cf499..2211a52e0fe 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.GraphDef}
  */
+@com.google.protobuf.Generated
 public final class GraphDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphDef)
@@ -21,8 +22,8 @@ public final class GraphDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphDef.class.getName());
   }
@@ -558,10 +559,10 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getNodeFieldBuilder();
-        getVersionsFieldBuilder();
-        getLibraryFieldBuilder();
-        getDebugInfoFieldBuilder();
+        internalGetNodeFieldBuilder();
+        internalGetVersionsFieldBuilder();
+        internalGetLibraryFieldBuilder();
+        internalGetDebugInfoFieldBuilder();
       }
     }
     @java.lang.Override
@@ -694,7 +695,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphDef other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             nodeBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNodeFieldBuilder() : null;
+                 internalGetNodeFieldBuilder() : null;
           } else {
             nodeBuilder_.addAllMessages(other.node_);
           }
@@ -753,7 +754,7 @@ public Builder mergeFrom(
             } // case 10
             case 18: {
               input.readMessage(
-                  getLibraryFieldBuilder().getBuilder(),
+                  internalGetLibraryFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000008;
               break;
@@ -765,14 +766,14 @@ public Builder mergeFrom(
             } // case 24
             case 34: {
               input.readMessage(
-                  getVersionsFieldBuilder().getBuilder(),
+                  internalGetVersionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
             } // case 34
             case 42: {
               input.readMessage(
-                  getDebugInfoFieldBuilder().getBuilder(),
+                  internalGetDebugInfoFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000010;
               break;
@@ -974,7 +975,7 @@ public Builder removeNode(int index) {
      */
     public org.tensorflow.proto.NodeDef.Builder getNodeBuilder(
         int index) {
-      return getNodeFieldBuilder().getBuilder(index);
+      return internalGetNodeFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.NodeDef node = 1;
@@ -1001,7 +1002,7 @@ public org.tensorflow.proto.NodeDefOrBuilder getNodeOrBuilder(
      * repeated .tensorflow.NodeDef node = 1;
      */
     public org.tensorflow.proto.NodeDef.Builder addNodeBuilder() {
-      return getNodeFieldBuilder().addBuilder(
+      return internalGetNodeFieldBuilder().addBuilder(
           org.tensorflow.proto.NodeDef.getDefaultInstance());
     }
     /**
@@ -1009,7 +1010,7 @@ public org.tensorflow.proto.NodeDef.Builder addNodeBuilder() {
      */
     public org.tensorflow.proto.NodeDef.Builder addNodeBuilder(
         int index) {
-      return getNodeFieldBuilder().addBuilder(
+      return internalGetNodeFieldBuilder().addBuilder(
           index, org.tensorflow.proto.NodeDef.getDefaultInstance());
     }
     /**
@@ -1017,11 +1018,11 @@ public org.tensorflow.proto.NodeDef.Builder addNodeBuilder(
      */
     public java.util.List 
          getNodeBuilderList() {
-      return getNodeFieldBuilder().getBuilderList();
+      return internalGetNodeFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.NodeDef, org.tensorflow.proto.NodeDef.Builder, org.tensorflow.proto.NodeDefOrBuilder> 
-        getNodeFieldBuilder() {
+        internalGetNodeFieldBuilder() {
       if (nodeBuilder_ == null) {
         nodeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.NodeDef, org.tensorflow.proto.NodeDef.Builder, org.tensorflow.proto.NodeDefOrBuilder>(
@@ -1167,7 +1168,7 @@ public Builder clearVersions() {
     public org.tensorflow.proto.VersionDef.Builder getVersionsBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getVersionsFieldBuilder().getBuilder();
+      return internalGetVersionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1197,7 +1198,7 @@ public org.tensorflow.proto.VersionDefOrBuilder getVersionsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder> 
-        getVersionsFieldBuilder() {
+        internalGetVersionsFieldBuilder() {
       if (versionsBuilder_ == null) {
         versionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder>(
@@ -1559,7 +1560,7 @@ public Builder clearLibrary() {
     public org.tensorflow.proto.FunctionDefLibrary.Builder getLibraryBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
-      return getLibraryFieldBuilder().getBuilder();
+      return internalGetLibraryFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1635,7 +1636,7 @@ public org.tensorflow.proto.FunctionDefLibraryOrBuilder getLibraryOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.FunctionDefLibrary, org.tensorflow.proto.FunctionDefLibrary.Builder, org.tensorflow.proto.FunctionDefLibraryOrBuilder> 
-        getLibraryFieldBuilder() {
+        internalGetLibraryFieldBuilder() {
       if (libraryBuilder_ == null) {
         libraryBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.FunctionDefLibrary, org.tensorflow.proto.FunctionDefLibrary.Builder, org.tensorflow.proto.FunctionDefLibraryOrBuilder>(
@@ -1766,7 +1767,7 @@ public Builder clearDebugInfo() {
     public org.tensorflow.proto.GraphDebugInfo.Builder getDebugInfoBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
-      return getDebugInfoFieldBuilder().getBuilder();
+      return internalGetDebugInfoFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1792,7 +1793,7 @@ public org.tensorflow.proto.GraphDebugInfoOrBuilder getDebugInfoOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GraphDebugInfo, org.tensorflow.proto.GraphDebugInfo.Builder, org.tensorflow.proto.GraphDebugInfoOrBuilder> 
-        getDebugInfoFieldBuilder() {
+        internalGetDebugInfoFieldBuilder() {
       if (debugInfoBuilder_ == null) {
         debugInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.GraphDebugInfo, org.tensorflow.proto.GraphDebugInfo.Builder, org.tensorflow.proto.GraphDebugInfoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDefOrBuilder.java
index aae20baf2ed..8cd0bd41038 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphExecutionTrace.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphExecutionTrace.java
index 6295c31c0b3..1f70a962e83 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphExecutionTrace.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphExecutionTrace.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -17,6 +17,7 @@
  *
  * Protobuf type {@code tensorflow.GraphExecutionTrace}
  */
+@com.google.protobuf.Generated
 public final class GraphExecutionTrace extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphExecutionTrace)
@@ -26,8 +27,8 @@ public final class GraphExecutionTrace extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphExecutionTrace.class.getName());
   }
@@ -542,7 +543,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorProtoFieldBuilder();
+        internalGetTensorProtoFieldBuilder();
       }
     }
     @java.lang.Override
@@ -701,7 +702,7 @@ public Builder mergeFrom(
             } // case 32
             case 42: {
               input.readMessage(
-                  getTensorProtoFieldBuilder().getBuilder(),
+                  internalGetTensorProtoFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000010;
               break;
@@ -1019,9 +1020,7 @@ public org.tensorflow.proto.TensorDebugMode getTensorDebugMode() {
      * @return This builder for chaining.
      */
     public Builder setTensorDebugMode(org.tensorflow.proto.TensorDebugMode value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000008;
       tensorDebugMode_ = value.getNumber();
       onChanged();
@@ -1175,7 +1174,7 @@ public Builder clearTensorProto() {
     public org.tensorflow.proto.TensorProto.Builder getTensorProtoBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
-      return getTensorProtoFieldBuilder().getBuilder();
+      return internalGetTensorProtoFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1205,7 +1204,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorProtoOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-        getTensorProtoFieldBuilder() {
+        internalGetTensorProtoFieldBuilder() {
       if (tensorProtoBuilder_ == null) {
         tensorProtoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphExecutionTraceOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphExecutionTraceOrBuilder.java
index 8ee56f2d353..a37071770aa 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphExecutionTraceOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphExecutionTraceOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphExecutionTraceOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphExecutionTrace)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOpCreation.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOpCreation.java
index 1cfdf8f521b..06d13fb6309 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOpCreation.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOpCreation.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.GraphOpCreation}
  */
+@com.google.protobuf.Generated
 public final class GraphOpCreation extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphOpCreation)
@@ -21,8 +22,8 @@ public final class GraphOpCreation extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphOpCreation.class.getName());
   }
@@ -745,7 +746,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getCodeLocationFieldBuilder();
+        internalGetCodeLocationFieldBuilder();
       }
     }
     @java.lang.Override
@@ -963,7 +964,7 @@ public Builder mergeFrom(
             } // case 56
             case 66: {
               input.readMessage(
-                  getCodeLocationFieldBuilder().getBuilder(),
+                  internalGetCodeLocationFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000080;
               break;
@@ -1776,7 +1777,7 @@ public Builder clearCodeLocation() {
     public org.tensorflow.proto.CodeLocation.Builder getCodeLocationBuilder() {
       bitField0_ |= 0x00000080;
       onChanged();
-      return getCodeLocationFieldBuilder().getBuilder();
+      return internalGetCodeLocationFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1802,7 +1803,7 @@ public org.tensorflow.proto.CodeLocationOrBuilder getCodeLocationOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CodeLocation, org.tensorflow.proto.CodeLocation.Builder, org.tensorflow.proto.CodeLocationOrBuilder> 
-        getCodeLocationFieldBuilder() {
+        internalGetCodeLocationFieldBuilder() {
       if (codeLocationBuilder_ == null) {
         codeLocationBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.CodeLocation, org.tensorflow.proto.CodeLocation.Builder, org.tensorflow.proto.CodeLocationOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOpCreationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOpCreationOrBuilder.java
index f2a77fe07be..202caa3828b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOpCreationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOpCreationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphOpCreationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphOpCreation)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOptions.java
index db16e305ded..3d31142c482 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOptions.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphOptions}
  */
+@com.google.protobuf.Generated
 public final class GraphOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphOptions)
@@ -17,8 +18,8 @@ public final class GraphOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphOptions.class.getName());
   }
@@ -536,8 +537,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getOptimizerOptionsFieldBuilder();
-        getRewriteOptionsFieldBuilder();
+        internalGetOptimizerOptionsFieldBuilder();
+        internalGetRewriteOptionsFieldBuilder();
       }
     }
     @java.lang.Override
@@ -703,7 +704,7 @@ public Builder mergeFrom(
             } // case 16
             case 26: {
               input.readMessage(
-                  getOptimizerOptionsFieldBuilder().getBuilder(),
+                  internalGetOptimizerOptionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -740,7 +741,7 @@ public Builder mergeFrom(
             } // case 72
             case 82: {
               input.readMessage(
-                  getRewriteOptionsFieldBuilder().getBuilder(),
+                  internalGetRewriteOptionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000100;
               break;
@@ -928,7 +929,7 @@ public Builder clearOptimizerOptions() {
     public org.tensorflow.proto.OptimizerOptions.Builder getOptimizerOptionsBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getOptimizerOptionsFieldBuilder().getBuilder();
+      return internalGetOptimizerOptionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -954,7 +955,7 @@ public org.tensorflow.proto.OptimizerOptionsOrBuilder getOptimizerOptionsOrBuild
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.OptimizerOptions, org.tensorflow.proto.OptimizerOptions.Builder, org.tensorflow.proto.OptimizerOptionsOrBuilder> 
-        getOptimizerOptionsFieldBuilder() {
+        internalGetOptimizerOptionsFieldBuilder() {
       if (optimizerOptionsBuilder_ == null) {
         optimizerOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.OptimizerOptions, org.tensorflow.proto.OptimizerOptions.Builder, org.tensorflow.proto.OptimizerOptionsOrBuilder>(
@@ -1396,7 +1397,7 @@ public Builder clearRewriteOptions() {
     public org.tensorflow.proto.RewriterConfig.Builder getRewriteOptionsBuilder() {
       bitField0_ |= 0x00000100;
       onChanged();
-      return getRewriteOptionsFieldBuilder().getBuilder();
+      return internalGetRewriteOptionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1426,7 +1427,7 @@ public org.tensorflow.proto.RewriterConfigOrBuilder getRewriteOptionsOrBuilder()
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.RewriterConfig, org.tensorflow.proto.RewriterConfig.Builder, org.tensorflow.proto.RewriterConfigOrBuilder> 
-        getRewriteOptionsFieldBuilder() {
+        internalGetRewriteOptionsFieldBuilder() {
       if (rewriteOptionsBuilder_ == null) {
         rewriteOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.RewriterConfig, org.tensorflow.proto.RewriterConfig.Builder, org.tensorflow.proto.RewriterConfigOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOptionsOrBuilder.java
index 7f2113d9509..54446eac7c4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphProtos.java
index 213acdde175..0ff800c8759 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class GraphProtos {
   private GraphProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferConstNodeInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferConstNodeInfo.java
index 4c40a27b902..8cd972db9e5 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferConstNodeInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferConstNodeInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphTransferConstNodeInfo}
  */
+@com.google.protobuf.Generated
 public final class GraphTransferConstNodeInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphTransferConstNodeInfo)
@@ -17,8 +18,8 @@ public final class GraphTransferConstNodeInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferConstNodeInfo.class.getName());
   }
@@ -492,7 +493,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphTransferConstNodeInfo other)
         }
         onChanged();
       }
-      if (other.getData() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getData().isEmpty()) {
         setData(other.getData());
       }
       if (other.dtype_ != 0) {
@@ -831,9 +832,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000010;
       dtype_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferConstNodeInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferConstNodeInfoOrBuilder.java
index 642428d772f..84fdc19b827 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferConstNodeInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferConstNodeInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphTransferConstNodeInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphTransferConstNodeInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphInputNodeInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphInputNodeInfo.java
index 2c57c86a711..d65b9179a84 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphInputNodeInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphInputNodeInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphTransferGraphInputNodeInfo}
  */
+@com.google.protobuf.Generated
 public final class GraphTransferGraphInputNodeInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphTransferGraphInputNodeInfo)
@@ -17,8 +18,8 @@ public final class GraphTransferGraphInputNodeInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferGraphInputNodeInfo.class.getName());
   }
@@ -698,9 +699,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000004;
       dtype_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphInputNodeInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphInputNodeInfoOrBuilder.java
index 3b063adca63..8e692d073c6 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphInputNodeInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphInputNodeInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphTransferGraphInputNodeInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphTransferGraphInputNodeInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphOutputNodeInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphOutputNodeInfo.java
index 2968ce25539..4cafe553aa2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphOutputNodeInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphOutputNodeInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphTransferGraphOutputNodeInfo}
  */
+@com.google.protobuf.Generated
 public final class GraphTransferGraphOutputNodeInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphTransferGraphOutputNodeInfo)
@@ -17,8 +18,8 @@ public final class GraphTransferGraphOutputNodeInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferGraphOutputNodeInfo.class.getName());
   }
@@ -698,9 +699,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000004;
       dtype_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphOutputNodeInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphOutputNodeInfoOrBuilder.java
index f645fdf04f7..f33549ee92d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphOutputNodeInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferGraphOutputNodeInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphTransferGraphOutputNodeInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphTransferGraphOutputNodeInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfo.java
index b5bf73cd37c..a1de23840ff 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfo.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -14,6 +14,7 @@
  *
  * Protobuf type {@code tensorflow.GraphTransferInfo}
  */
+@com.google.protobuf.Generated
 public final class GraphTransferInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphTransferInfo)
@@ -23,8 +24,8 @@ public final class GraphTransferInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferInfo.class.getName());
   }
@@ -75,8 +76,8 @@ public enum Destination
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Destination.class.getName());
     }
@@ -144,7 +145,7 @@ public Destination findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.GraphTransferInfo.getDescriptor().getEnumTypes().get(0);
     }
@@ -909,7 +910,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphTransferInfo other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             nodeInfoBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNodeInfoFieldBuilder() : null;
+                 internalGetNodeInfoFieldBuilder() : null;
           } else {
             nodeInfoBuilder_.addAllMessages(other.nodeInfo_);
           }
@@ -935,7 +936,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphTransferInfo other) {
             bitField0_ = (bitField0_ & ~0x00000002);
             constNodeInfoBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getConstNodeInfoFieldBuilder() : null;
+                 internalGetConstNodeInfoFieldBuilder() : null;
           } else {
             constNodeInfoBuilder_.addAllMessages(other.constNodeInfo_);
           }
@@ -961,7 +962,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphTransferInfo other) {
             bitField0_ = (bitField0_ & ~0x00000004);
             nodeInputInfoBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNodeInputInfoFieldBuilder() : null;
+                 internalGetNodeInputInfoFieldBuilder() : null;
           } else {
             nodeInputInfoBuilder_.addAllMessages(other.nodeInputInfo_);
           }
@@ -987,7 +988,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphTransferInfo other) {
             bitField0_ = (bitField0_ & ~0x00000008);
             nodeOutputInfoBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNodeOutputInfoFieldBuilder() : null;
+                 internalGetNodeOutputInfoFieldBuilder() : null;
           } else {
             nodeOutputInfoBuilder_.addAllMessages(other.nodeOutputInfo_);
           }
@@ -1013,7 +1014,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphTransferInfo other) {
             bitField0_ = (bitField0_ & ~0x00000010);
             graphInputNodeInfoBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getGraphInputNodeInfoFieldBuilder() : null;
+                 internalGetGraphInputNodeInfoFieldBuilder() : null;
           } else {
             graphInputNodeInfoBuilder_.addAllMessages(other.graphInputNodeInfo_);
           }
@@ -1039,7 +1040,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphTransferInfo other) {
             bitField0_ = (bitField0_ & ~0x00000020);
             graphOutputNodeInfoBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getGraphOutputNodeInfoFieldBuilder() : null;
+                 internalGetGraphOutputNodeInfoFieldBuilder() : null;
           } else {
             graphOutputNodeInfoBuilder_.addAllMessages(other.graphOutputNodeInfo_);
           }
@@ -1354,7 +1355,7 @@ public Builder removeNodeInfo(int index) {
      */
     public org.tensorflow.proto.GraphTransferNodeInfo.Builder getNodeInfoBuilder(
         int index) {
-      return getNodeInfoFieldBuilder().getBuilder(index);
+      return internalGetNodeInfoFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.GraphTransferNodeInfo node_info = 1;
@@ -1381,7 +1382,7 @@ public org.tensorflow.proto.GraphTransferNodeInfoOrBuilder getNodeInfoOrBuilder(
      * repeated .tensorflow.GraphTransferNodeInfo node_info = 1;
      */
     public org.tensorflow.proto.GraphTransferNodeInfo.Builder addNodeInfoBuilder() {
-      return getNodeInfoFieldBuilder().addBuilder(
+      return internalGetNodeInfoFieldBuilder().addBuilder(
           org.tensorflow.proto.GraphTransferNodeInfo.getDefaultInstance());
     }
     /**
@@ -1389,7 +1390,7 @@ public org.tensorflow.proto.GraphTransferNodeInfo.Builder addNodeInfoBuilder() {
      */
     public org.tensorflow.proto.GraphTransferNodeInfo.Builder addNodeInfoBuilder(
         int index) {
-      return getNodeInfoFieldBuilder().addBuilder(
+      return internalGetNodeInfoFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GraphTransferNodeInfo.getDefaultInstance());
     }
     /**
@@ -1397,11 +1398,11 @@ public org.tensorflow.proto.GraphTransferNodeInfo.Builder addNodeInfoBuilder(
      */
     public java.util.List 
          getNodeInfoBuilderList() {
-      return getNodeInfoFieldBuilder().getBuilderList();
+      return internalGetNodeInfoFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GraphTransferNodeInfo, org.tensorflow.proto.GraphTransferNodeInfo.Builder, org.tensorflow.proto.GraphTransferNodeInfoOrBuilder> 
-        getNodeInfoFieldBuilder() {
+        internalGetNodeInfoFieldBuilder() {
       if (nodeInfoBuilder_ == null) {
         nodeInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GraphTransferNodeInfo, org.tensorflow.proto.GraphTransferNodeInfo.Builder, org.tensorflow.proto.GraphTransferNodeInfoOrBuilder>(
@@ -1594,7 +1595,7 @@ public Builder removeConstNodeInfo(int index) {
      */
     public org.tensorflow.proto.GraphTransferConstNodeInfo.Builder getConstNodeInfoBuilder(
         int index) {
-      return getConstNodeInfoFieldBuilder().getBuilder(index);
+      return internalGetConstNodeInfoFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.GraphTransferConstNodeInfo const_node_info = 2;
@@ -1621,7 +1622,7 @@ public org.tensorflow.proto.GraphTransferConstNodeInfoOrBuilder getConstNodeInfo
      * repeated .tensorflow.GraphTransferConstNodeInfo const_node_info = 2;
      */
     public org.tensorflow.proto.GraphTransferConstNodeInfo.Builder addConstNodeInfoBuilder() {
-      return getConstNodeInfoFieldBuilder().addBuilder(
+      return internalGetConstNodeInfoFieldBuilder().addBuilder(
           org.tensorflow.proto.GraphTransferConstNodeInfo.getDefaultInstance());
     }
     /**
@@ -1629,7 +1630,7 @@ public org.tensorflow.proto.GraphTransferConstNodeInfo.Builder addConstNodeInfoB
      */
     public org.tensorflow.proto.GraphTransferConstNodeInfo.Builder addConstNodeInfoBuilder(
         int index) {
-      return getConstNodeInfoFieldBuilder().addBuilder(
+      return internalGetConstNodeInfoFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GraphTransferConstNodeInfo.getDefaultInstance());
     }
     /**
@@ -1637,11 +1638,11 @@ public org.tensorflow.proto.GraphTransferConstNodeInfo.Builder addConstNodeInfoB
      */
     public java.util.List 
          getConstNodeInfoBuilderList() {
-      return getConstNodeInfoFieldBuilder().getBuilderList();
+      return internalGetConstNodeInfoFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GraphTransferConstNodeInfo, org.tensorflow.proto.GraphTransferConstNodeInfo.Builder, org.tensorflow.proto.GraphTransferConstNodeInfoOrBuilder> 
-        getConstNodeInfoFieldBuilder() {
+        internalGetConstNodeInfoFieldBuilder() {
       if (constNodeInfoBuilder_ == null) {
         constNodeInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GraphTransferConstNodeInfo, org.tensorflow.proto.GraphTransferConstNodeInfo.Builder, org.tensorflow.proto.GraphTransferConstNodeInfoOrBuilder>(
@@ -1834,7 +1835,7 @@ public Builder removeNodeInputInfo(int index) {
      */
     public org.tensorflow.proto.GraphTransferNodeInputInfo.Builder getNodeInputInfoBuilder(
         int index) {
-      return getNodeInputInfoFieldBuilder().getBuilder(index);
+      return internalGetNodeInputInfoFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.GraphTransferNodeInputInfo node_input_info = 3;
@@ -1861,7 +1862,7 @@ public org.tensorflow.proto.GraphTransferNodeInputInfoOrBuilder getNodeInputInfo
      * repeated .tensorflow.GraphTransferNodeInputInfo node_input_info = 3;
      */
     public org.tensorflow.proto.GraphTransferNodeInputInfo.Builder addNodeInputInfoBuilder() {
-      return getNodeInputInfoFieldBuilder().addBuilder(
+      return internalGetNodeInputInfoFieldBuilder().addBuilder(
           org.tensorflow.proto.GraphTransferNodeInputInfo.getDefaultInstance());
     }
     /**
@@ -1869,7 +1870,7 @@ public org.tensorflow.proto.GraphTransferNodeInputInfo.Builder addNodeInputInfoB
      */
     public org.tensorflow.proto.GraphTransferNodeInputInfo.Builder addNodeInputInfoBuilder(
         int index) {
-      return getNodeInputInfoFieldBuilder().addBuilder(
+      return internalGetNodeInputInfoFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GraphTransferNodeInputInfo.getDefaultInstance());
     }
     /**
@@ -1877,11 +1878,11 @@ public org.tensorflow.proto.GraphTransferNodeInputInfo.Builder addNodeInputInfoB
      */
     public java.util.List 
          getNodeInputInfoBuilderList() {
-      return getNodeInputInfoFieldBuilder().getBuilderList();
+      return internalGetNodeInputInfoFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GraphTransferNodeInputInfo, org.tensorflow.proto.GraphTransferNodeInputInfo.Builder, org.tensorflow.proto.GraphTransferNodeInputInfoOrBuilder> 
-        getNodeInputInfoFieldBuilder() {
+        internalGetNodeInputInfoFieldBuilder() {
       if (nodeInputInfoBuilder_ == null) {
         nodeInputInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GraphTransferNodeInputInfo, org.tensorflow.proto.GraphTransferNodeInputInfo.Builder, org.tensorflow.proto.GraphTransferNodeInputInfoOrBuilder>(
@@ -2074,7 +2075,7 @@ public Builder removeNodeOutputInfo(int index) {
      */
     public org.tensorflow.proto.GraphTransferNodeOutputInfo.Builder getNodeOutputInfoBuilder(
         int index) {
-      return getNodeOutputInfoFieldBuilder().getBuilder(index);
+      return internalGetNodeOutputInfoFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.GraphTransferNodeOutputInfo node_output_info = 4;
@@ -2101,7 +2102,7 @@ public org.tensorflow.proto.GraphTransferNodeOutputInfoOrBuilder getNodeOutputIn
      * repeated .tensorflow.GraphTransferNodeOutputInfo node_output_info = 4;
      */
     public org.tensorflow.proto.GraphTransferNodeOutputInfo.Builder addNodeOutputInfoBuilder() {
-      return getNodeOutputInfoFieldBuilder().addBuilder(
+      return internalGetNodeOutputInfoFieldBuilder().addBuilder(
           org.tensorflow.proto.GraphTransferNodeOutputInfo.getDefaultInstance());
     }
     /**
@@ -2109,7 +2110,7 @@ public org.tensorflow.proto.GraphTransferNodeOutputInfo.Builder addNodeOutputInf
      */
     public org.tensorflow.proto.GraphTransferNodeOutputInfo.Builder addNodeOutputInfoBuilder(
         int index) {
-      return getNodeOutputInfoFieldBuilder().addBuilder(
+      return internalGetNodeOutputInfoFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GraphTransferNodeOutputInfo.getDefaultInstance());
     }
     /**
@@ -2117,11 +2118,11 @@ public org.tensorflow.proto.GraphTransferNodeOutputInfo.Builder addNodeOutputInf
      */
     public java.util.List 
          getNodeOutputInfoBuilderList() {
-      return getNodeOutputInfoFieldBuilder().getBuilderList();
+      return internalGetNodeOutputInfoFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GraphTransferNodeOutputInfo, org.tensorflow.proto.GraphTransferNodeOutputInfo.Builder, org.tensorflow.proto.GraphTransferNodeOutputInfoOrBuilder> 
-        getNodeOutputInfoFieldBuilder() {
+        internalGetNodeOutputInfoFieldBuilder() {
       if (nodeOutputInfoBuilder_ == null) {
         nodeOutputInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GraphTransferNodeOutputInfo, org.tensorflow.proto.GraphTransferNodeOutputInfo.Builder, org.tensorflow.proto.GraphTransferNodeOutputInfoOrBuilder>(
@@ -2366,7 +2367,7 @@ public Builder removeGraphInputNodeInfo(int index) {
      */
     public org.tensorflow.proto.GraphTransferGraphInputNodeInfo.Builder getGraphInputNodeInfoBuilder(
         int index) {
-      return getGraphInputNodeInfoFieldBuilder().getBuilder(index);
+      return internalGetGraphInputNodeInfoFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -2405,7 +2406,7 @@ public org.tensorflow.proto.GraphTransferGraphInputNodeInfoOrBuilder getGraphInp
      * repeated .tensorflow.GraphTransferGraphInputNodeInfo graph_input_node_info = 5;
      */
     public org.tensorflow.proto.GraphTransferGraphInputNodeInfo.Builder addGraphInputNodeInfoBuilder() {
-      return getGraphInputNodeInfoFieldBuilder().addBuilder(
+      return internalGetGraphInputNodeInfoFieldBuilder().addBuilder(
           org.tensorflow.proto.GraphTransferGraphInputNodeInfo.getDefaultInstance());
     }
     /**
@@ -2417,7 +2418,7 @@ public org.tensorflow.proto.GraphTransferGraphInputNodeInfo.Builder addGraphInpu
      */
     public org.tensorflow.proto.GraphTransferGraphInputNodeInfo.Builder addGraphInputNodeInfoBuilder(
         int index) {
-      return getGraphInputNodeInfoFieldBuilder().addBuilder(
+      return internalGetGraphInputNodeInfoFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GraphTransferGraphInputNodeInfo.getDefaultInstance());
     }
     /**
@@ -2429,11 +2430,11 @@ public org.tensorflow.proto.GraphTransferGraphInputNodeInfo.Builder addGraphInpu
      */
     public java.util.List 
          getGraphInputNodeInfoBuilderList() {
-      return getGraphInputNodeInfoFieldBuilder().getBuilderList();
+      return internalGetGraphInputNodeInfoFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GraphTransferGraphInputNodeInfo, org.tensorflow.proto.GraphTransferGraphInputNodeInfo.Builder, org.tensorflow.proto.GraphTransferGraphInputNodeInfoOrBuilder> 
-        getGraphInputNodeInfoFieldBuilder() {
+        internalGetGraphInputNodeInfoFieldBuilder() {
       if (graphInputNodeInfoBuilder_ == null) {
         graphInputNodeInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GraphTransferGraphInputNodeInfo, org.tensorflow.proto.GraphTransferGraphInputNodeInfo.Builder, org.tensorflow.proto.GraphTransferGraphInputNodeInfoOrBuilder>(
@@ -2626,7 +2627,7 @@ public Builder removeGraphOutputNodeInfo(int index) {
      */
     public org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.Builder getGraphOutputNodeInfoBuilder(
         int index) {
-      return getGraphOutputNodeInfoFieldBuilder().getBuilder(index);
+      return internalGetGraphOutputNodeInfoFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.GraphTransferGraphOutputNodeInfo graph_output_node_info = 6;
@@ -2653,7 +2654,7 @@ public org.tensorflow.proto.GraphTransferGraphOutputNodeInfoOrBuilder getGraphOu
      * repeated .tensorflow.GraphTransferGraphOutputNodeInfo graph_output_node_info = 6;
      */
     public org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.Builder addGraphOutputNodeInfoBuilder() {
-      return getGraphOutputNodeInfoFieldBuilder().addBuilder(
+      return internalGetGraphOutputNodeInfoFieldBuilder().addBuilder(
           org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.getDefaultInstance());
     }
     /**
@@ -2661,7 +2662,7 @@ public org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.Builder addGraphOut
      */
     public org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.Builder addGraphOutputNodeInfoBuilder(
         int index) {
-      return getGraphOutputNodeInfoFieldBuilder().addBuilder(
+      return internalGetGraphOutputNodeInfoFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.getDefaultInstance());
     }
     /**
@@ -2669,11 +2670,11 @@ public org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.Builder addGraphOut
      */
     public java.util.List 
          getGraphOutputNodeInfoBuilderList() {
-      return getGraphOutputNodeInfoFieldBuilder().getBuilderList();
+      return internalGetGraphOutputNodeInfoFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GraphTransferGraphOutputNodeInfo, org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.Builder, org.tensorflow.proto.GraphTransferGraphOutputNodeInfoOrBuilder> 
-        getGraphOutputNodeInfoFieldBuilder() {
+        internalGetGraphOutputNodeInfoFieldBuilder() {
       if (graphOutputNodeInfoBuilder_ == null) {
         graphOutputNodeInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GraphTransferGraphOutputNodeInfo, org.tensorflow.proto.GraphTransferGraphOutputNodeInfo.Builder, org.tensorflow.proto.GraphTransferGraphOutputNodeInfoOrBuilder>(
@@ -2736,9 +2737,7 @@ public org.tensorflow.proto.GraphTransferInfo.Destination getDestination() {
      * @return This builder for chaining.
      */
     public Builder setDestination(org.tensorflow.proto.GraphTransferInfo.Destination value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000040;
       destination_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfoOrBuilder.java
index 037aa6c37d2..9ea5a731b42 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphTransferInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphTransferInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfoProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfoProto.java
index 2bc9df9dcf6..7bc67dac367 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfoProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferInfoProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class GraphTransferInfoProto {
   private GraphTransferInfoProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferInfoProto.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInfo.java
index 9dba76360d4..6807082f903 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphTransferNodeInfo}
  */
+@com.google.protobuf.Generated
 public final class GraphTransferNodeInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphTransferNodeInfo)
@@ -17,8 +18,8 @@ public final class GraphTransferNodeInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferNodeInfo.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInfoOrBuilder.java
index 01ef2545a87..38c56b2add4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphTransferNodeInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphTransferNodeInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInput.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInput.java
index 0400ad21f83..02d7f4d8b47 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInput.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInput.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphTransferNodeInput}
  */
+@com.google.protobuf.Generated
 public final class GraphTransferNodeInput extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphTransferNodeInput)
@@ -17,8 +18,8 @@ public final class GraphTransferNodeInput extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferNodeInput.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputInfo.java
index 93f82e0e8c8..889d8457658 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphTransferNodeInputInfo}
  */
+@com.google.protobuf.Generated
 public final class GraphTransferNodeInputInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphTransferNodeInputInfo)
@@ -17,8 +18,8 @@ public final class GraphTransferNodeInputInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferNodeInputInfo.class.getName());
   }
@@ -393,7 +394,7 @@ public Builder mergeFrom(org.tensorflow.proto.GraphTransferNodeInputInfo other)
             bitField0_ = (bitField0_ & ~0x00000002);
             nodeInputBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNodeInputFieldBuilder() : null;
+                 internalGetNodeInputFieldBuilder() : null;
           } else {
             nodeInputBuilder_.addAllMessages(other.nodeInput_);
           }
@@ -672,7 +673,7 @@ public Builder removeNodeInput(int index) {
      */
     public org.tensorflow.proto.GraphTransferNodeInput.Builder getNodeInputBuilder(
         int index) {
-      return getNodeInputFieldBuilder().getBuilder(index);
+      return internalGetNodeInputFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.GraphTransferNodeInput node_input = 2;
@@ -699,7 +700,7 @@ public org.tensorflow.proto.GraphTransferNodeInputOrBuilder getNodeInputOrBuilde
      * repeated .tensorflow.GraphTransferNodeInput node_input = 2;
      */
     public org.tensorflow.proto.GraphTransferNodeInput.Builder addNodeInputBuilder() {
-      return getNodeInputFieldBuilder().addBuilder(
+      return internalGetNodeInputFieldBuilder().addBuilder(
           org.tensorflow.proto.GraphTransferNodeInput.getDefaultInstance());
     }
     /**
@@ -707,7 +708,7 @@ public org.tensorflow.proto.GraphTransferNodeInput.Builder addNodeInputBuilder()
      */
     public org.tensorflow.proto.GraphTransferNodeInput.Builder addNodeInputBuilder(
         int index) {
-      return getNodeInputFieldBuilder().addBuilder(
+      return internalGetNodeInputFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GraphTransferNodeInput.getDefaultInstance());
     }
     /**
@@ -715,11 +716,11 @@ public org.tensorflow.proto.GraphTransferNodeInput.Builder addNodeInputBuilder(
      */
     public java.util.List 
          getNodeInputBuilderList() {
-      return getNodeInputFieldBuilder().getBuilderList();
+      return internalGetNodeInputFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GraphTransferNodeInput, org.tensorflow.proto.GraphTransferNodeInput.Builder, org.tensorflow.proto.GraphTransferNodeInputOrBuilder> 
-        getNodeInputFieldBuilder() {
+        internalGetNodeInputFieldBuilder() {
       if (nodeInputBuilder_ == null) {
         nodeInputBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GraphTransferNodeInput, org.tensorflow.proto.GraphTransferNodeInput.Builder, org.tensorflow.proto.GraphTransferNodeInputOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputInfoOrBuilder.java
index 391ca3f1e24..0606ab53849 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphTransferNodeInputInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphTransferNodeInputInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputOrBuilder.java
index dd8ac32649e..ec985c3cf47 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeInputOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphTransferNodeInputOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphTransferNodeInput)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeOutputInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeOutputInfo.java
index b42b3fb547c..b62eeb24215 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeOutputInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeOutputInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.GraphTransferNodeOutputInfo}
  */
+@com.google.protobuf.Generated
 public final class GraphTransferNodeOutputInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.GraphTransferNodeOutputInfo)
@@ -17,8 +18,8 @@ public final class GraphTransferNodeOutputInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       GraphTransferNodeOutputInfo.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeOutputInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeOutputInfoOrBuilder.java
index 562283cc21f..07fea662c7c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeOutputInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/GraphTransferNodeOutputInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/graph_transfer_info.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface GraphTransferNodeOutputInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.GraphTransferNodeOutputInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Histogram.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Histogram.java
index 5567c346630..a49d6d603c7 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Histogram.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Histogram.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/histogram.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class Histogram {
   private Histogram() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Histogram.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/HistogramProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/HistogramProto.java
index 669741c85a8..7d28e3b1310 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/HistogramProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/HistogramProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/histogram.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.HistogramProto}
  */
+@com.google.protobuf.Generated
 public final class HistogramProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.HistogramProto)
@@ -22,8 +23,8 @@ public final class HistogramProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       HistogramProto.class.getName());
   }
@@ -564,19 +565,19 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(org.tensorflow.proto.HistogramProto other) {
       if (other == org.tensorflow.proto.HistogramProto.getDefaultInstance()) return this;
-      if (other.getMin() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getMin()) != 0) {
         setMin(other.getMin());
       }
-      if (other.getMax() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getMax()) != 0) {
         setMax(other.getMax());
       }
-      if (other.getNum() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getNum()) != 0) {
         setNum(other.getNum());
       }
-      if (other.getSum() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getSum()) != 0) {
         setSum(other.getSum());
       }
-      if (other.getSumSquares() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getSumSquares()) != 0) {
         setSumSquares(other.getSumSquares());
       }
       if (!other.bucketLimit_.isEmpty()) {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/HistogramProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/HistogramProtoOrBuilder.java
index 9c644fa0611..c3cb6f012ab 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/HistogramProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/HistogramProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/histogram.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface HistogramProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.HistogramProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Int64List.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Int64List.java
index 82bf09b381d..bdd94d1214b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Int64List.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Int64List.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.Int64List}
  */
+@com.google.protobuf.Generated
 public final class Int64List extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.Int64List)
@@ -17,8 +18,8 @@ public final class Int64List extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Int64List.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Int64ListOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Int64ListOrBuilder.java
index e1d8271d30d..58a7a5af0b9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Int64ListOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Int64ListOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/feature.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface Int64ListOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.Int64List)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/InterconnectLink.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/InterconnectLink.java
index e544fdbcd0e..8b2a0b6dcf6 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/InterconnectLink.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/InterconnectLink.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.InterconnectLink}
  */
+@com.google.protobuf.Generated
 public final class InterconnectLink extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.InterconnectLink)
@@ -17,8 +18,8 @@ public final class InterconnectLink extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       InterconnectLink.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/InterconnectLinkOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/InterconnectLinkOrBuilder.java
index fa3786c27ca..746003b3dc1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/InterconnectLinkOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/InterconnectLinkOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface InterconnectLinkOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.InterconnectLink)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDef.java
index 0e6e8660937..b2443d86cd4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/cluster.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.JobDef}
  */
+@com.google.protobuf.Generated
 public final class JobDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.JobDef)
@@ -21,8 +22,8 @@ public final class JobDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       JobDef.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDefOrBuilder.java
index 3de76e91c40..63d7e4e09de 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/cluster.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface JobDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.JobDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDeviceFilters.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDeviceFilters.java
index cbddbbfd0d0..6a65fbc6360 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDeviceFilters.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDeviceFilters.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/device_filters.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.JobDeviceFilters}
  */
+@com.google.protobuf.Generated
 public final class JobDeviceFilters extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.JobDeviceFilters)
@@ -21,8 +22,8 @@ public final class JobDeviceFilters extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       JobDeviceFilters.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDeviceFiltersOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDeviceFiltersOrBuilder.java
index 3988b3ef971..cdfa8ba62b3 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDeviceFiltersOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/JobDeviceFiltersOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/device_filters.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface JobDeviceFiltersOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.JobDeviceFilters)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDef.java
index 8efe1c1e228..085d0329dd7 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDef.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/kernel_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.KernelDef}
  */
+@com.google.protobuf.Generated
 public final class KernelDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.KernelDef)
@@ -17,8 +18,8 @@ public final class KernelDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       KernelDef.class.getName());
   }
@@ -114,8 +115,8 @@ public static final class AttrConstraint extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         AttrConstraint.class.getName());
     }
@@ -434,7 +435,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getAllowedValuesFieldBuilder();
+          internalGetAllowedValuesFieldBuilder();
         }
       }
       @java.lang.Override
@@ -546,7 +547,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getAllowedValuesFieldBuilder().getBuilder(),
+                    internalGetAllowedValuesFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -786,7 +787,7 @@ public Builder clearAllowedValues() {
       public org.tensorflow.proto.AttrValue.Builder getAllowedValuesBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getAllowedValuesFieldBuilder().getBuilder();
+        return internalGetAllowedValuesFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -814,7 +815,7 @@ public org.tensorflow.proto.AttrValueOrBuilder getAllowedValuesOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.AttrValue, org.tensorflow.proto.AttrValue.Builder, org.tensorflow.proto.AttrValueOrBuilder> 
-          getAllowedValuesFieldBuilder() {
+          internalGetAllowedValuesFieldBuilder() {
         if (allowedValuesBuilder_ == null) {
           allowedValuesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.AttrValue, org.tensorflow.proto.AttrValue.Builder, org.tensorflow.proto.AttrValueOrBuilder>(
@@ -1507,7 +1508,7 @@ public Builder mergeFrom(org.tensorflow.proto.KernelDef other) {
             bitField0_ = (bitField0_ & ~0x00000004);
             constraintBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getConstraintFieldBuilder() : null;
+                 internalGetConstraintFieldBuilder() : null;
           } else {
             constraintBuilder_.addAllMessages(other.constraint_);
           }
@@ -1977,7 +1978,7 @@ public Builder removeConstraint(int index) {
      */
     public org.tensorflow.proto.KernelDef.AttrConstraint.Builder getConstraintBuilder(
         int index) {
-      return getConstraintFieldBuilder().getBuilder(index);
+      return internalGetConstraintFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.KernelDef.AttrConstraint constraint = 3;
@@ -2004,7 +2005,7 @@ public org.tensorflow.proto.KernelDef.AttrConstraintOrBuilder getConstraintOrBui
      * repeated .tensorflow.KernelDef.AttrConstraint constraint = 3;
      */
     public org.tensorflow.proto.KernelDef.AttrConstraint.Builder addConstraintBuilder() {
-      return getConstraintFieldBuilder().addBuilder(
+      return internalGetConstraintFieldBuilder().addBuilder(
           org.tensorflow.proto.KernelDef.AttrConstraint.getDefaultInstance());
     }
     /**
@@ -2012,7 +2013,7 @@ public org.tensorflow.proto.KernelDef.AttrConstraint.Builder addConstraintBuilde
      */
     public org.tensorflow.proto.KernelDef.AttrConstraint.Builder addConstraintBuilder(
         int index) {
-      return getConstraintFieldBuilder().addBuilder(
+      return internalGetConstraintFieldBuilder().addBuilder(
           index, org.tensorflow.proto.KernelDef.AttrConstraint.getDefaultInstance());
     }
     /**
@@ -2020,11 +2021,11 @@ public org.tensorflow.proto.KernelDef.AttrConstraint.Builder addConstraintBuilde
      */
     public java.util.List 
          getConstraintBuilderList() {
-      return getConstraintFieldBuilder().getBuilderList();
+      return internalGetConstraintFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.KernelDef.AttrConstraint, org.tensorflow.proto.KernelDef.AttrConstraint.Builder, org.tensorflow.proto.KernelDef.AttrConstraintOrBuilder> 
-        getConstraintFieldBuilder() {
+        internalGetConstraintFieldBuilder() {
       if (constraintBuilder_ == null) {
         constraintBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.KernelDef.AttrConstraint, org.tensorflow.proto.KernelDef.AttrConstraint.Builder, org.tensorflow.proto.KernelDef.AttrConstraintOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDefOrBuilder.java
index 33d6bc783ed..1d901c14ec0 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/kernel_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface KernelDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.KernelDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDefProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDefProtos.java
index 6186e35bccd..1570609cd71 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDefProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelDefProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/kernel_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class KernelDefProtos {
   private KernelDefProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       KernelDefProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelList.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelList.java
index add0709c673..0de3d64ddcc 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelList.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelList.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/kernel_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.KernelList}
  */
+@com.google.protobuf.Generated
 public final class KernelList extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.KernelList)
@@ -21,8 +22,8 @@ public final class KernelList extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       KernelList.class.getName());
   }
@@ -372,7 +373,7 @@ public Builder mergeFrom(org.tensorflow.proto.KernelList other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             kernelBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getKernelFieldBuilder() : null;
+                 internalGetKernelFieldBuilder() : null;
           } else {
             kernelBuilder_.addAllMessages(other.kernel_);
           }
@@ -614,7 +615,7 @@ public Builder removeKernel(int index) {
      */
     public org.tensorflow.proto.KernelDef.Builder getKernelBuilder(
         int index) {
-      return getKernelFieldBuilder().getBuilder(index);
+      return internalGetKernelFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.KernelDef kernel = 1;
@@ -641,7 +642,7 @@ public org.tensorflow.proto.KernelDefOrBuilder getKernelOrBuilder(
      * repeated .tensorflow.KernelDef kernel = 1;
      */
     public org.tensorflow.proto.KernelDef.Builder addKernelBuilder() {
-      return getKernelFieldBuilder().addBuilder(
+      return internalGetKernelFieldBuilder().addBuilder(
           org.tensorflow.proto.KernelDef.getDefaultInstance());
     }
     /**
@@ -649,7 +650,7 @@ public org.tensorflow.proto.KernelDef.Builder addKernelBuilder() {
      */
     public org.tensorflow.proto.KernelDef.Builder addKernelBuilder(
         int index) {
-      return getKernelFieldBuilder().addBuilder(
+      return internalGetKernelFieldBuilder().addBuilder(
           index, org.tensorflow.proto.KernelDef.getDefaultInstance());
     }
     /**
@@ -657,11 +658,11 @@ public org.tensorflow.proto.KernelDef.Builder addKernelBuilder(
      */
     public java.util.List 
          getKernelBuilderList() {
-      return getKernelFieldBuilder().getBuilderList();
+      return internalGetKernelFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.KernelDef, org.tensorflow.proto.KernelDef.Builder, org.tensorflow.proto.KernelDefOrBuilder> 
-        getKernelFieldBuilder() {
+        internalGetKernelFieldBuilder() {
       if (kernelBuilder_ == null) {
         kernelBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.KernelDef, org.tensorflow.proto.KernelDef.Builder, org.tensorflow.proto.KernelDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelListOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelListOrBuilder.java
index ef703603a2b..358f99fb2b8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelListOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/KernelListOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/kernel_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface KernelListOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.KernelList)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LocalLinks.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LocalLinks.java
index d17b6ea169f..0a3429a5d9f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LocalLinks.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LocalLinks.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.LocalLinks}
  */
+@com.google.protobuf.Generated
 public final class LocalLinks extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.LocalLinks)
@@ -17,8 +18,8 @@ public final class LocalLinks extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       LocalLinks.class.getName());
   }
@@ -364,7 +365,7 @@ public Builder mergeFrom(org.tensorflow.proto.LocalLinks other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             linkBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getLinkFieldBuilder() : null;
+                 internalGetLinkFieldBuilder() : null;
           } else {
             linkBuilder_.addAllMessages(other.link_);
           }
@@ -606,7 +607,7 @@ public Builder removeLink(int index) {
      */
     public org.tensorflow.proto.InterconnectLink.Builder getLinkBuilder(
         int index) {
-      return getLinkFieldBuilder().getBuilder(index);
+      return internalGetLinkFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.InterconnectLink link = 1;
@@ -633,7 +634,7 @@ public org.tensorflow.proto.InterconnectLinkOrBuilder getLinkOrBuilder(
      * repeated .tensorflow.InterconnectLink link = 1;
      */
     public org.tensorflow.proto.InterconnectLink.Builder addLinkBuilder() {
-      return getLinkFieldBuilder().addBuilder(
+      return internalGetLinkFieldBuilder().addBuilder(
           org.tensorflow.proto.InterconnectLink.getDefaultInstance());
     }
     /**
@@ -641,7 +642,7 @@ public org.tensorflow.proto.InterconnectLink.Builder addLinkBuilder() {
      */
     public org.tensorflow.proto.InterconnectLink.Builder addLinkBuilder(
         int index) {
-      return getLinkFieldBuilder().addBuilder(
+      return internalGetLinkFieldBuilder().addBuilder(
           index, org.tensorflow.proto.InterconnectLink.getDefaultInstance());
     }
     /**
@@ -649,11 +650,11 @@ public org.tensorflow.proto.InterconnectLink.Builder addLinkBuilder(
      */
     public java.util.List 
          getLinkBuilderList() {
-      return getLinkFieldBuilder().getBuilderList();
+      return internalGetLinkFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.InterconnectLink, org.tensorflow.proto.InterconnectLink.Builder, org.tensorflow.proto.InterconnectLinkOrBuilder> 
-        getLinkFieldBuilder() {
+        internalGetLinkFieldBuilder() {
       if (linkBuilder_ == null) {
         linkBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.InterconnectLink, org.tensorflow.proto.InterconnectLink.Builder, org.tensorflow.proto.InterconnectLinkOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LocalLinksOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LocalLinksOrBuilder.java
index 408b99a6c97..6818e4ff68e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LocalLinksOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LocalLinksOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/device_attributes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface LocalLinksOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.LocalLinks)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMemoryProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMemoryProtos.java
index 847171ae16e..a8865ed44f1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMemoryProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMemoryProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class LogMemoryProtos {
   private LogMemoryProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       LogMemoryProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMessage.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMessage.java
index d18b8648fbd..e34f5ea5f07 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMessage.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMessage.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -15,6 +15,7 @@
  *
  * Protobuf type {@code tensorflow.LogMessage}
  */
+@com.google.protobuf.Generated
 @java.lang.Deprecated public final class LogMessage extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.LogMessage)
@@ -24,8 +25,8 @@
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       LogMessage.class.getName());
   }
@@ -94,8 +95,8 @@ private LogMessage() {
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Level.class.getName());
     }
@@ -190,7 +191,7 @@ public Level findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.LogMessage.getDescriptor().getEnumTypes().get(0);
     }
@@ -632,9 +633,7 @@ public org.tensorflow.proto.LogMessage.Level getLevel() {
      * @return This builder for chaining.
      */
     public Builder setLevel(org.tensorflow.proto.LogMessage.Level value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       level_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMessageOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMessageOrBuilder.java
index 4174158b973..c48bff00105 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMessageOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/LogMessageOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 @java.lang.Deprecated public interface LogMessageOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.LogMessage)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MachineConfiguration.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MachineConfiguration.java
index 9d7cc47a571..642a05e4b5e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MachineConfiguration.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MachineConfiguration.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MachineConfiguration}
  */
+@com.google.protobuf.Generated
 public final class MachineConfiguration extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MachineConfiguration)
@@ -17,8 +18,8 @@ public final class MachineConfiguration extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MachineConfiguration.class.getName());
   }
@@ -638,11 +639,11 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getPlatformInfoFieldBuilder();
-        getCpuInfoFieldBuilder();
-        getDeviceInfoFieldBuilder();
-        getAvailableDeviceInfoFieldBuilder();
-        getMemoryInfoFieldBuilder();
+        internalGetPlatformInfoFieldBuilder();
+        internalGetCpuInfoFieldBuilder();
+        internalGetDeviceInfoFieldBuilder();
+        internalGetAvailableDeviceInfoFieldBuilder();
+        internalGetMemoryInfoFieldBuilder();
       }
     }
     @java.lang.Override
@@ -811,7 +812,7 @@ public Builder mergeFrom(org.tensorflow.proto.MachineConfiguration other) {
             bitField0_ = (bitField0_ & ~0x00000010);
             deviceInfoBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getDeviceInfoFieldBuilder() : null;
+                 internalGetDeviceInfoFieldBuilder() : null;
           } else {
             deviceInfoBuilder_.addAllMessages(other.deviceInfo_);
           }
@@ -837,7 +838,7 @@ public Builder mergeFrom(org.tensorflow.proto.MachineConfiguration other) {
             bitField0_ = (bitField0_ & ~0x00000020);
             availableDeviceInfoBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getAvailableDeviceInfoFieldBuilder() : null;
+                 internalGetAvailableDeviceInfoFieldBuilder() : null;
           } else {
             availableDeviceInfoBuilder_.addAllMessages(other.availableDeviceInfo_);
           }
@@ -879,14 +880,14 @@ public Builder mergeFrom(
             } // case 10
             case 18: {
               input.readMessage(
-                  getPlatformInfoFieldBuilder().getBuilder(),
+                  internalGetPlatformInfoFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
             } // case 18
             case 26: {
               input.readMessage(
-                  getCpuInfoFieldBuilder().getBuilder(),
+                  internalGetCpuInfoFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000008;
               break;
@@ -919,7 +920,7 @@ public Builder mergeFrom(
             } // case 42
             case 50: {
               input.readMessage(
-                  getMemoryInfoFieldBuilder().getBuilder(),
+                  internalGetMemoryInfoFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000040;
               break;
@@ -1249,7 +1250,7 @@ public Builder clearPlatformInfo() {
     public org.tensorflow.proto.PlatformInfo.Builder getPlatformInfoBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getPlatformInfoFieldBuilder().getBuilder();
+      return internalGetPlatformInfoFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1275,7 +1276,7 @@ public org.tensorflow.proto.PlatformInfoOrBuilder getPlatformInfoOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.PlatformInfo, org.tensorflow.proto.PlatformInfo.Builder, org.tensorflow.proto.PlatformInfoOrBuilder> 
-        getPlatformInfoFieldBuilder() {
+        internalGetPlatformInfoFieldBuilder() {
       if (platformInfoBuilder_ == null) {
         platformInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.PlatformInfo, org.tensorflow.proto.PlatformInfo.Builder, org.tensorflow.proto.PlatformInfoOrBuilder>(
@@ -1406,7 +1407,7 @@ public Builder clearCpuInfo() {
     public org.tensorflow.proto.CPUInfo.Builder getCpuInfoBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
-      return getCpuInfoFieldBuilder().getBuilder();
+      return internalGetCpuInfoFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1432,7 +1433,7 @@ public org.tensorflow.proto.CPUInfoOrBuilder getCpuInfoOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CPUInfo, org.tensorflow.proto.CPUInfo.Builder, org.tensorflow.proto.CPUInfoOrBuilder> 
-        getCpuInfoFieldBuilder() {
+        internalGetCpuInfoFieldBuilder() {
       if (cpuInfoBuilder_ == null) {
         cpuInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.CPUInfo, org.tensorflow.proto.CPUInfo.Builder, org.tensorflow.proto.CPUInfoOrBuilder>(
@@ -1676,7 +1677,7 @@ public Builder removeDeviceInfo(int index) {
      */
     public com.google.protobuf.Any.Builder getDeviceInfoBuilder(
         int index) {
-      return getDeviceInfoFieldBuilder().getBuilder(index);
+      return internalGetDeviceInfoFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1715,7 +1716,7 @@ public com.google.protobuf.AnyOrBuilder getDeviceInfoOrBuilder(
      * repeated .google.protobuf.Any device_info = 4;
      */
     public com.google.protobuf.Any.Builder addDeviceInfoBuilder() {
-      return getDeviceInfoFieldBuilder().addBuilder(
+      return internalGetDeviceInfoFieldBuilder().addBuilder(
           com.google.protobuf.Any.getDefaultInstance());
     }
     /**
@@ -1727,7 +1728,7 @@ public com.google.protobuf.Any.Builder addDeviceInfoBuilder() {
      */
     public com.google.protobuf.Any.Builder addDeviceInfoBuilder(
         int index) {
-      return getDeviceInfoFieldBuilder().addBuilder(
+      return internalGetDeviceInfoFieldBuilder().addBuilder(
           index, com.google.protobuf.Any.getDefaultInstance());
     }
     /**
@@ -1739,11 +1740,11 @@ public com.google.protobuf.Any.Builder addDeviceInfoBuilder(
      */
     public java.util.List 
          getDeviceInfoBuilderList() {
-      return getDeviceInfoFieldBuilder().getBuilderList();
+      return internalGetDeviceInfoFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder> 
-        getDeviceInfoFieldBuilder() {
+        internalGetDeviceInfoFieldBuilder() {
       if (deviceInfoBuilder_ == null) {
         deviceInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder>(
@@ -1988,7 +1989,7 @@ public Builder removeAvailableDeviceInfo(int index) {
      */
     public org.tensorflow.proto.AvailableDeviceInfo.Builder getAvailableDeviceInfoBuilder(
         int index) {
-      return getAvailableDeviceInfoFieldBuilder().getBuilder(index);
+      return internalGetAvailableDeviceInfoFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -2027,7 +2028,7 @@ public org.tensorflow.proto.AvailableDeviceInfoOrBuilder getAvailableDeviceInfoO
      * repeated .tensorflow.AvailableDeviceInfo available_device_info = 5;
      */
     public org.tensorflow.proto.AvailableDeviceInfo.Builder addAvailableDeviceInfoBuilder() {
-      return getAvailableDeviceInfoFieldBuilder().addBuilder(
+      return internalGetAvailableDeviceInfoFieldBuilder().addBuilder(
           org.tensorflow.proto.AvailableDeviceInfo.getDefaultInstance());
     }
     /**
@@ -2039,7 +2040,7 @@ public org.tensorflow.proto.AvailableDeviceInfo.Builder addAvailableDeviceInfoBu
      */
     public org.tensorflow.proto.AvailableDeviceInfo.Builder addAvailableDeviceInfoBuilder(
         int index) {
-      return getAvailableDeviceInfoFieldBuilder().addBuilder(
+      return internalGetAvailableDeviceInfoFieldBuilder().addBuilder(
           index, org.tensorflow.proto.AvailableDeviceInfo.getDefaultInstance());
     }
     /**
@@ -2051,11 +2052,11 @@ public org.tensorflow.proto.AvailableDeviceInfo.Builder addAvailableDeviceInfoBu
      */
     public java.util.List 
          getAvailableDeviceInfoBuilderList() {
-      return getAvailableDeviceInfoFieldBuilder().getBuilderList();
+      return internalGetAvailableDeviceInfoFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.AvailableDeviceInfo, org.tensorflow.proto.AvailableDeviceInfo.Builder, org.tensorflow.proto.AvailableDeviceInfoOrBuilder> 
-        getAvailableDeviceInfoFieldBuilder() {
+        internalGetAvailableDeviceInfoFieldBuilder() {
       if (availableDeviceInfoBuilder_ == null) {
         availableDeviceInfoBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.AvailableDeviceInfo, org.tensorflow.proto.AvailableDeviceInfo.Builder, org.tensorflow.proto.AvailableDeviceInfoOrBuilder>(
@@ -2159,7 +2160,7 @@ public Builder clearMemoryInfo() {
     public org.tensorflow.proto.MemoryInfo.Builder getMemoryInfoBuilder() {
       bitField0_ |= 0x00000040;
       onChanged();
-      return getMemoryInfoFieldBuilder().getBuilder();
+      return internalGetMemoryInfoFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.MemoryInfo memory_info = 6;
@@ -2177,7 +2178,7 @@ public org.tensorflow.proto.MemoryInfoOrBuilder getMemoryInfoOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.MemoryInfo, org.tensorflow.proto.MemoryInfo.Builder, org.tensorflow.proto.MemoryInfoOrBuilder> 
-        getMemoryInfoFieldBuilder() {
+        internalGetMemoryInfoFieldBuilder() {
       if (memoryInfoBuilder_ == null) {
         memoryInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.MemoryInfo, org.tensorflow.proto.MemoryInfo.Builder, org.tensorflow.proto.MemoryInfoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MachineConfigurationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MachineConfigurationOrBuilder.java
index 05929ab4e94..cd6529a9510 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MachineConfigurationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MachineConfigurationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MachineConfigurationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MachineConfiguration)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemmappedFileSystem.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemmappedFileSystem.java
index e76113f6643..5e86ba312d4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemmappedFileSystem.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemmappedFileSystem.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/memmapped_file_system.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class MemmappedFileSystem {
   private MemmappedFileSystem() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemmappedFileSystem.class.getName());
   }
@@ -69,8 +70,8 @@ public static final class MemmappedFileSystemDirectoryElement extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MemmappedFileSystemDirectoryElement.class.getName());
     }
@@ -733,8 +734,8 @@ public static final class MemmappedFileSystemDirectory extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MemmappedFileSystemDirectory.class.getName());
     }
@@ -1084,7 +1085,7 @@ public Builder mergeFrom(org.tensorflow.proto.MemmappedFileSystem.MemmappedFileS
               bitField0_ = (bitField0_ & ~0x00000001);
               elementBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getElementFieldBuilder() : null;
+                   internalGetElementFieldBuilder() : null;
             } else {
               elementBuilder_.addAllMessages(other.element_);
             }
@@ -1326,7 +1327,7 @@ public Builder removeElement(int index) {
        */
       public org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement.Builder getElementBuilder(
           int index) {
-        return getElementFieldBuilder().getBuilder(index);
+        return internalGetElementFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.MemmappedFileSystemDirectoryElement element = 1;
@@ -1353,7 +1354,7 @@ public org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElem
        * repeated .tensorflow.MemmappedFileSystemDirectoryElement element = 1;
        */
       public org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement.Builder addElementBuilder() {
-        return getElementFieldBuilder().addBuilder(
+        return internalGetElementFieldBuilder().addBuilder(
             org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement.getDefaultInstance());
       }
       /**
@@ -1361,7 +1362,7 @@ public org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElem
        */
       public org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement.Builder addElementBuilder(
           int index) {
-        return getElementFieldBuilder().addBuilder(
+        return internalGetElementFieldBuilder().addBuilder(
             index, org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement.getDefaultInstance());
       }
       /**
@@ -1369,11 +1370,11 @@ public org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElem
        */
       public java.util.List 
            getElementBuilderList() {
-        return getElementFieldBuilder().getBuilderList();
+        return internalGetElementFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement, org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement.Builder, org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElementOrBuilder> 
-          getElementFieldBuilder() {
+          internalGetElementFieldBuilder() {
         if (elementBuilder_ == null) {
           elementBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement, org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElement.Builder, org.tensorflow.proto.MemmappedFileSystem.MemmappedFileSystemDirectoryElementOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryInfo.java
index 7154821aa85..4f459e7bea5 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MemoryInfo}
  */
+@com.google.protobuf.Generated
 public final class MemoryInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MemoryInfo)
@@ -17,8 +18,8 @@ public final class MemoryInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemoryInfo.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryInfoOrBuilder.java
index 15da16855ac..3d14ee2a939 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MemoryInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MemoryInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawAllocation.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawAllocation.java
index 1f7d254c4cd..4edd02f318b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawAllocation.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawAllocation.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MemoryLogRawAllocation}
  */
+@com.google.protobuf.Generated
 public final class MemoryLogRawAllocation extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MemoryLogRawAllocation)
@@ -17,8 +18,8 @@ public final class MemoryLogRawAllocation extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemoryLogRawAllocation.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawAllocationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawAllocationOrBuilder.java
index 82a9160572d..d00b738da50 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawAllocationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawAllocationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MemoryLogRawAllocationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MemoryLogRawAllocation)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawDeallocation.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawDeallocation.java
index 1215138ec89..51e389f37ff 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawDeallocation.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawDeallocation.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MemoryLogRawDeallocation}
  */
+@com.google.protobuf.Generated
 public final class MemoryLogRawDeallocation extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MemoryLogRawDeallocation)
@@ -17,8 +18,8 @@ public final class MemoryLogRawDeallocation extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemoryLogRawDeallocation.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawDeallocationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawDeallocationOrBuilder.java
index 485bb3ff60d..1181180b3a3 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawDeallocationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogRawDeallocationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MemoryLogRawDeallocationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MemoryLogRawDeallocation)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogStep.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogStep.java
index 0f191d9751d..f58a1378608 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogStep.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogStep.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MemoryLogStep}
  */
+@com.google.protobuf.Generated
 public final class MemoryLogStep extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MemoryLogStep)
@@ -17,8 +18,8 @@ public final class MemoryLogStep extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemoryLogStep.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogStepOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogStepOrBuilder.java
index 39d7ad3312b..7f6d77ffdb8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogStepOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogStepOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MemoryLogStepOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MemoryLogStep)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorAllocation.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorAllocation.java
index a2f153d0515..af4b580aef2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorAllocation.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorAllocation.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MemoryLogTensorAllocation}
  */
+@com.google.protobuf.Generated
 public final class MemoryLogTensorAllocation extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MemoryLogTensorAllocation)
@@ -17,8 +18,8 @@ public final class MemoryLogTensorAllocation extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemoryLogTensorAllocation.class.getName());
   }
@@ -363,7 +364,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorFieldBuilder();
+        internalGetTensorFieldBuilder();
       }
     }
     @java.lang.Override
@@ -487,7 +488,7 @@ public Builder mergeFrom(
             } // case 18
             case 26: {
               input.readMessage(
-                  getTensorFieldBuilder().getBuilder(),
+                  internalGetTensorFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
@@ -769,7 +770,7 @@ public Builder clearTensor() {
     public org.tensorflow.proto.TensorDescription.Builder getTensorBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getTensorFieldBuilder().getBuilder();
+      return internalGetTensorFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -795,7 +796,7 @@ public org.tensorflow.proto.TensorDescriptionOrBuilder getTensorOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorDescription, org.tensorflow.proto.TensorDescription.Builder, org.tensorflow.proto.TensorDescriptionOrBuilder> 
-        getTensorFieldBuilder() {
+        internalGetTensorFieldBuilder() {
       if (tensorBuilder_ == null) {
         tensorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorDescription, org.tensorflow.proto.TensorDescription.Builder, org.tensorflow.proto.TensorDescriptionOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorAllocationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorAllocationOrBuilder.java
index c8c3c7dd79f..5d6c5cec84c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorAllocationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorAllocationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MemoryLogTensorAllocationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MemoryLogTensorAllocation)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorDeallocation.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorDeallocation.java
index 2cd7114b7f1..b551a4d3d5a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorDeallocation.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorDeallocation.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MemoryLogTensorDeallocation}
  */
+@com.google.protobuf.Generated
 public final class MemoryLogTensorDeallocation extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MemoryLogTensorDeallocation)
@@ -17,8 +18,8 @@ public final class MemoryLogTensorDeallocation extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemoryLogTensorDeallocation.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorDeallocationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorDeallocationOrBuilder.java
index e3e45595114..55421e91e96 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorDeallocationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorDeallocationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MemoryLogTensorDeallocationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MemoryLogTensorDeallocation)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorOutput.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorOutput.java
index 2916c4a1637..2312f92469f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorOutput.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorOutput.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MemoryLogTensorOutput}
  */
+@com.google.protobuf.Generated
 public final class MemoryLogTensorOutput extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MemoryLogTensorOutput)
@@ -17,8 +18,8 @@ public final class MemoryLogTensorOutput extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemoryLogTensorOutput.class.getName());
   }
@@ -389,7 +390,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorFieldBuilder();
+        internalGetTensorFieldBuilder();
       }
     }
     @java.lang.Override
@@ -525,7 +526,7 @@ public Builder mergeFrom(
             } // case 24
             case 34: {
               input.readMessage(
-                  getTensorFieldBuilder().getBuilder(),
+                  internalGetTensorFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000008;
               break;
@@ -851,7 +852,7 @@ public Builder clearTensor() {
     public org.tensorflow.proto.TensorDescription.Builder getTensorBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
-      return getTensorFieldBuilder().getBuilder();
+      return internalGetTensorFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -877,7 +878,7 @@ public org.tensorflow.proto.TensorDescriptionOrBuilder getTensorOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorDescription, org.tensorflow.proto.TensorDescription.Builder, org.tensorflow.proto.TensorDescriptionOrBuilder> 
-        getTensorFieldBuilder() {
+        internalGetTensorFieldBuilder() {
       if (tensorBuilder_ == null) {
         tensorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorDescription, org.tensorflow.proto.TensorDescription.Builder, org.tensorflow.proto.TensorDescriptionOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorOutputOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorOutputOrBuilder.java
index b85bb1491aa..d400174ba56 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorOutputOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryLogTensorOutputOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/log_memory.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MemoryLogTensorOutputOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MemoryLogTensorOutput)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryStats.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryStats.java
index dbb3b986b34..52c705e0633 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryStats.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryStats.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.MemoryStats}
  */
+@com.google.protobuf.Generated
 public final class MemoryStats extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MemoryStats)
@@ -21,8 +22,8 @@ public final class MemoryStats extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MemoryStats.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryStatsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryStatsOrBuilder.java
index 3c04e6831dd..54962ebf3a3 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryStatsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MemoryStatsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MemoryStatsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MemoryStats)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphDef.java
index 8dfe44e7a05..419c6e9ec7e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -22,6 +22,7 @@
  *
  * Protobuf type {@code tensorflow.MetaGraphDef}
  */
+@com.google.protobuf.Generated
 public final class MetaGraphDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MetaGraphDef)
@@ -31,8 +32,8 @@ public final class MetaGraphDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MetaGraphDef.class.getName());
   }
@@ -348,8 +349,8 @@ public static final class MetaInfoDef extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MetaInfoDef.class.getName());
     }
@@ -1127,8 +1128,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getStrippedOpListFieldBuilder();
-          getAnyInfoFieldBuilder();
+          internalGetStrippedOpListFieldBuilder();
+          internalGetAnyInfoFieldBuilder();
         }
       }
       @java.lang.Override
@@ -1303,14 +1304,14 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getStrippedOpListFieldBuilder().getBuilder(),
+                    internalGetStrippedOpListFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
               } // case 18
               case 26: {
                 input.readMessage(
-                    getAnyInfoFieldBuilder().getBuilder(),
+                    internalGetAnyInfoFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -1585,7 +1586,7 @@ public Builder clearStrippedOpList() {
       public org.tensorflow.proto.OpList.Builder getStrippedOpListBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getStrippedOpListFieldBuilder().getBuilder();
+        return internalGetStrippedOpListFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -1613,7 +1614,7 @@ public org.tensorflow.proto.OpListOrBuilder getStrippedOpListOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.OpList, org.tensorflow.proto.OpList.Builder, org.tensorflow.proto.OpListOrBuilder> 
-          getStrippedOpListFieldBuilder() {
+          internalGetStrippedOpListFieldBuilder() {
         if (strippedOpListBuilder_ == null) {
           strippedOpListBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.OpList, org.tensorflow.proto.OpList.Builder, org.tensorflow.proto.OpListOrBuilder>(
@@ -1751,7 +1752,7 @@ public Builder clearAnyInfo() {
       public com.google.protobuf.Any.Builder getAnyInfoBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getAnyInfoFieldBuilder().getBuilder();
+        return internalGetAnyInfoFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -1779,7 +1780,7 @@ public com.google.protobuf.AnyOrBuilder getAnyInfoOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder> 
-          getAnyInfoFieldBuilder() {
+          internalGetAnyInfoFieldBuilder() {
         if (anyInfoBuilder_ == null) {
           anyInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder>(
@@ -3180,11 +3181,11 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getMetaInfoDefFieldBuilder();
-        getGraphDefFieldBuilder();
-        getSaverDefFieldBuilder();
-        getAssetFileDefFieldBuilder();
-        getObjectGraphDefFieldBuilder();
+        internalGetMetaInfoDefFieldBuilder();
+        internalGetGraphDefFieldBuilder();
+        internalGetSaverDefFieldBuilder();
+        internalGetAssetFileDefFieldBuilder();
+        internalGetObjectGraphDefFieldBuilder();
       }
     }
     @java.lang.Override
@@ -3347,7 +3348,7 @@ public Builder mergeFrom(org.tensorflow.proto.MetaGraphDef other) {
             bitField0_ = (bitField0_ & ~0x00000020);
             assetFileDefBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getAssetFileDefFieldBuilder() : null;
+                 internalGetAssetFileDefFieldBuilder() : null;
           } else {
             assetFileDefBuilder_.addAllMessages(other.assetFileDef_);
           }
@@ -3384,21 +3385,21 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getMetaInfoDefFieldBuilder().getBuilder(),
+                  internalGetMetaInfoDefFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
             } // case 10
             case 18: {
               input.readMessage(
-                  getGraphDefFieldBuilder().getBuilder(),
+                  internalGetGraphDefFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
             } // case 18
             case 26: {
               input.readMessage(
-                  getSaverDefFieldBuilder().getBuilder(),
+                  internalGetSaverDefFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
@@ -3436,7 +3437,7 @@ public Builder mergeFrom(
             } // case 50
             case 58: {
               input.readMessage(
-                  getObjectGraphDefFieldBuilder().getBuilder(),
+                  internalGetObjectGraphDefFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000040;
               break;
@@ -3549,7 +3550,7 @@ public Builder clearMetaInfoDef() {
     public org.tensorflow.proto.MetaGraphDef.MetaInfoDef.Builder getMetaInfoDefBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getMetaInfoDefFieldBuilder().getBuilder();
+      return internalGetMetaInfoDefFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.MetaGraphDef.MetaInfoDef meta_info_def = 1;
@@ -3567,7 +3568,7 @@ public org.tensorflow.proto.MetaGraphDef.MetaInfoDefOrBuilder getMetaInfoDefOrBu
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.MetaGraphDef.MetaInfoDef, org.tensorflow.proto.MetaGraphDef.MetaInfoDef.Builder, org.tensorflow.proto.MetaGraphDef.MetaInfoDefOrBuilder> 
-        getMetaInfoDefFieldBuilder() {
+        internalGetMetaInfoDefFieldBuilder() {
       if (metaInfoDefBuilder_ == null) {
         metaInfoDefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.MetaGraphDef.MetaInfoDef, org.tensorflow.proto.MetaGraphDef.MetaInfoDef.Builder, org.tensorflow.proto.MetaGraphDef.MetaInfoDefOrBuilder>(
@@ -3698,7 +3699,7 @@ public Builder clearGraphDef() {
     public org.tensorflow.proto.GraphDef.Builder getGraphDefBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getGraphDefFieldBuilder().getBuilder();
+      return internalGetGraphDefFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -3724,7 +3725,7 @@ public org.tensorflow.proto.GraphDefOrBuilder getGraphDefOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder> 
-        getGraphDefFieldBuilder() {
+        internalGetGraphDefFieldBuilder() {
       if (graphDefBuilder_ == null) {
         graphDefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder>(
@@ -3855,7 +3856,7 @@ public Builder clearSaverDef() {
     public org.tensorflow.proto.SaverDef.Builder getSaverDefBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getSaverDefFieldBuilder().getBuilder();
+      return internalGetSaverDefFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -3881,7 +3882,7 @@ public org.tensorflow.proto.SaverDefOrBuilder getSaverDefOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SaverDef, org.tensorflow.proto.SaverDef.Builder, org.tensorflow.proto.SaverDefOrBuilder> 
-        getSaverDefFieldBuilder() {
+        internalGetSaverDefFieldBuilder() {
       if (saverDefBuilder_ == null) {
         saverDefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.SaverDef, org.tensorflow.proto.SaverDef.Builder, org.tensorflow.proto.SaverDefOrBuilder>(
@@ -4515,7 +4516,7 @@ public Builder removeAssetFileDef(int index) {
      */
     public org.tensorflow.proto.AssetFileDef.Builder getAssetFileDefBuilder(
         int index) {
-      return getAssetFileDefFieldBuilder().getBuilder(index);
+      return internalGetAssetFileDefFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -4554,7 +4555,7 @@ public org.tensorflow.proto.AssetFileDefOrBuilder getAssetFileDefOrBuilder(
      * repeated .tensorflow.AssetFileDef asset_file_def = 6;
      */
     public org.tensorflow.proto.AssetFileDef.Builder addAssetFileDefBuilder() {
-      return getAssetFileDefFieldBuilder().addBuilder(
+      return internalGetAssetFileDefFieldBuilder().addBuilder(
           org.tensorflow.proto.AssetFileDef.getDefaultInstance());
     }
     /**
@@ -4566,7 +4567,7 @@ public org.tensorflow.proto.AssetFileDef.Builder addAssetFileDefBuilder() {
      */
     public org.tensorflow.proto.AssetFileDef.Builder addAssetFileDefBuilder(
         int index) {
-      return getAssetFileDefFieldBuilder().addBuilder(
+      return internalGetAssetFileDefFieldBuilder().addBuilder(
           index, org.tensorflow.proto.AssetFileDef.getDefaultInstance());
     }
     /**
@@ -4578,11 +4579,11 @@ public org.tensorflow.proto.AssetFileDef.Builder addAssetFileDefBuilder(
      */
     public java.util.List 
          getAssetFileDefBuilderList() {
-      return getAssetFileDefFieldBuilder().getBuilderList();
+      return internalGetAssetFileDefFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.AssetFileDef, org.tensorflow.proto.AssetFileDef.Builder, org.tensorflow.proto.AssetFileDefOrBuilder> 
-        getAssetFileDefFieldBuilder() {
+        internalGetAssetFileDefFieldBuilder() {
       if (assetFileDefBuilder_ == null) {
         assetFileDefBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.AssetFileDef, org.tensorflow.proto.AssetFileDef.Builder, org.tensorflow.proto.AssetFileDefOrBuilder>(
@@ -4714,7 +4715,7 @@ public Builder clearObjectGraphDef() {
     public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectGraph.Builder getObjectGraphDefBuilder() {
       bitField0_ |= 0x00000040;
       onChanged();
-      return getObjectGraphDefFieldBuilder().getBuilder();
+      return internalGetObjectGraphDefFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -4740,7 +4741,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectGraphOrBuilder
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectGraph, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectGraph.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectGraphOrBuilder> 
-        getObjectGraphDefFieldBuilder() {
+        internalGetObjectGraphDefFieldBuilder() {
       if (objectGraphDefBuilder_ == null) {
         objectGraphDefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectGraph, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectGraph.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectGraphOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphDefOrBuilder.java
index 510b6c87bbc..3c2ac6969a9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MetaGraphDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MetaGraphDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphProtos.java
index eb8242aed48..d6d502bb186 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetaGraphProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class MetaGraphProtos {
   private MetaGraphProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MetaGraphProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetricEntry.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetricEntry.java
index b0190343737..9d7dcefa51b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetricEntry.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetricEntry.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.MetricEntry}
  */
+@com.google.protobuf.Generated
 public final class MetricEntry extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.MetricEntry)
@@ -17,8 +18,8 @@ public final class MetricEntry extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MetricEntry.class.getName());
   }
@@ -416,8 +417,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getMinValueFieldBuilder();
-        getMaxValueFieldBuilder();
+        internalGetMinValueFieldBuilder();
+        internalGetMaxValueFieldBuilder();
       }
     }
     @java.lang.Override
@@ -508,7 +509,7 @@ public Builder mergeFrom(org.tensorflow.proto.MetricEntry other) {
         bitField0_ |= 0x00000001;
         onChanged();
       }
-      if (other.getValue() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getValue()) != 0) {
         setValue(other.getValue());
       }
       if (other.hasMinValue()) {
@@ -555,14 +556,14 @@ public Builder mergeFrom(
             } // case 17
             case 26: {
               input.readMessage(
-                  getMinValueFieldBuilder().getBuilder(),
+                  internalGetMinValueFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
             } // case 26
             case 34: {
               input.readMessage(
-                  getMaxValueFieldBuilder().getBuilder(),
+                  internalGetMaxValueFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000008;
               break;
@@ -839,7 +840,7 @@ public Builder clearMinValue() {
     public com.google.protobuf.DoubleValue.Builder getMinValueBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getMinValueFieldBuilder().getBuilder();
+      return internalGetMinValueFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -865,7 +866,7 @@ public com.google.protobuf.DoubleValueOrBuilder getMinValueOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         com.google.protobuf.DoubleValue, com.google.protobuf.DoubleValue.Builder, com.google.protobuf.DoubleValueOrBuilder> 
-        getMinValueFieldBuilder() {
+        internalGetMinValueFieldBuilder() {
       if (minValueBuilder_ == null) {
         minValueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             com.google.protobuf.DoubleValue, com.google.protobuf.DoubleValue.Builder, com.google.protobuf.DoubleValueOrBuilder>(
@@ -996,7 +997,7 @@ public Builder clearMaxValue() {
     public com.google.protobuf.DoubleValue.Builder getMaxValueBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
-      return getMaxValueFieldBuilder().getBuilder();
+      return internalGetMaxValueFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1022,7 +1023,7 @@ public com.google.protobuf.DoubleValueOrBuilder getMaxValueOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         com.google.protobuf.DoubleValue, com.google.protobuf.DoubleValue.Builder, com.google.protobuf.DoubleValueOrBuilder> 
-        getMaxValueFieldBuilder() {
+        internalGetMaxValueFieldBuilder() {
       if (maxValueBuilder_ == null) {
         maxValueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             com.google.protobuf.DoubleValue, com.google.protobuf.DoubleValue.Builder, com.google.protobuf.DoubleValueOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetricEntryOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetricEntryOrBuilder.java
index 3d0eec363a3..a82f618e920 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetricEntryOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/MetricEntryOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface MetricEntryOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.MetricEntry)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NameAttrList.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NameAttrList.java
index b79641012af..3dcce10e93c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NameAttrList.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NameAttrList.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/attr_value.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.NameAttrList}
  */
+@com.google.protobuf.Generated
 public final class NameAttrList extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.NameAttrList)
@@ -22,8 +23,8 @@ public final class NameAttrList extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NameAttrList.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NameAttrListOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NameAttrListOrBuilder.java
index 132bb9b6aa8..7ffeb9a4e86 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NameAttrListOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NameAttrListOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/attr_value.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface NameAttrListOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.NameAttrList)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProto.java
index ac9667ae7b8..a97e16f19a0 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/named_tensor.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.NamedTensorProto}
  */
+@com.google.protobuf.Generated
 public final class NamedTensorProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.NamedTensorProto)
@@ -21,8 +22,8 @@ public final class NamedTensorProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NamedTensorProto.class.getName());
   }
@@ -357,7 +358,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorFieldBuilder();
+        internalGetTensorFieldBuilder();
       }
     }
     @java.lang.Override
@@ -469,7 +470,7 @@ public Builder mergeFrom(
             } // case 10
             case 18: {
               input.readMessage(
-                  getTensorFieldBuilder().getBuilder(),
+                  internalGetTensorFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -737,7 +738,7 @@ public Builder clearTensor() {
     public org.tensorflow.proto.TensorProto.Builder getTensorBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getTensorFieldBuilder().getBuilder();
+      return internalGetTensorFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -773,7 +774,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-        getTensorFieldBuilder() {
+        internalGetTensorFieldBuilder() {
       if (tensorBuilder_ == null) {
         tensorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProtoOrBuilder.java
index 236bd5974fe..92f9a20a1ea 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/named_tensor.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface NamedTensorProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.NamedTensorProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProtos.java
index bbc43be0671..05b0410623b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NamedTensorProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/named_tensor.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class NamedTensorProtos {
   private NamedTensorProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NamedTensorProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeDef.java
index c6490a052ac..ff5a03ee424 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeDef.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/node_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.NodeDef}
  */
+@com.google.protobuf.Generated
 public final class NodeDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.NodeDef)
@@ -17,8 +18,8 @@ public final class NodeDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NodeDef.class.getName());
   }
@@ -205,8 +206,8 @@ public static final class ExperimentalDebugInfo extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ExperimentalDebugInfo.class.getName());
     }
@@ -1970,8 +1971,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getExperimentalDebugInfoFieldBuilder();
-        getExperimentalTypeFieldBuilder();
+        internalGetExperimentalDebugInfoFieldBuilder();
+        internalGetExperimentalTypeFieldBuilder();
       }
     }
     @java.lang.Override
@@ -2163,14 +2164,14 @@ public Builder mergeFrom(
             } // case 42
             case 50: {
               input.readMessage(
-                  getExperimentalDebugInfoFieldBuilder().getBuilder(),
+                  internalGetExperimentalDebugInfoFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000020;
               break;
             } // case 50
             case 58: {
               input.readMessage(
-                  getExperimentalTypeFieldBuilder().getBuilder(),
+                  internalGetExperimentalTypeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000040;
               break;
@@ -3155,7 +3156,7 @@ public Builder clearExperimentalDebugInfo() {
     public org.tensorflow.proto.NodeDef.ExperimentalDebugInfo.Builder getExperimentalDebugInfoBuilder() {
       bitField0_ |= 0x00000020;
       onChanged();
-      return getExperimentalDebugInfoFieldBuilder().getBuilder();
+      return internalGetExperimentalDebugInfoFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -3181,7 +3182,7 @@ public org.tensorflow.proto.NodeDef.ExperimentalDebugInfoOrBuilder getExperiment
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.NodeDef.ExperimentalDebugInfo, org.tensorflow.proto.NodeDef.ExperimentalDebugInfo.Builder, org.tensorflow.proto.NodeDef.ExperimentalDebugInfoOrBuilder> 
-        getExperimentalDebugInfoFieldBuilder() {
+        internalGetExperimentalDebugInfoFieldBuilder() {
       if (experimentalDebugInfoBuilder_ == null) {
         experimentalDebugInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.NodeDef.ExperimentalDebugInfo, org.tensorflow.proto.NodeDef.ExperimentalDebugInfo.Builder, org.tensorflow.proto.NodeDef.ExperimentalDebugInfoOrBuilder>(
@@ -3333,7 +3334,7 @@ public Builder clearExperimentalType() {
     public org.tensorflow.proto.FullTypeDef.Builder getExperimentalTypeBuilder() {
       bitField0_ |= 0x00000040;
       onChanged();
-      return getExperimentalTypeFieldBuilder().getBuilder();
+      return internalGetExperimentalTypeFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -3365,7 +3366,7 @@ public org.tensorflow.proto.FullTypeDefOrBuilder getExperimentalTypeOrBuilder()
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.FullTypeDef, org.tensorflow.proto.FullTypeDef.Builder, org.tensorflow.proto.FullTypeDefOrBuilder> 
-        getExperimentalTypeFieldBuilder() {
+        internalGetExperimentalTypeFieldBuilder() {
       if (experimentalTypeBuilder_ == null) {
         experimentalTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.FullTypeDef, org.tensorflow.proto.FullTypeDef.Builder, org.tensorflow.proto.FullTypeDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeDefOrBuilder.java
index 481d28e251a..769ab3d9a34 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/node_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface NodeDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.NodeDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeExecStats.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeExecStats.java
index 64c5fad07c0..2c6ec004178 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeExecStats.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeExecStats.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.NodeExecStats}
  */
+@com.google.protobuf.Generated
 public final class NodeExecStats extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.NodeExecStats)
@@ -21,8 +22,8 @@ public final class NodeExecStats extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NodeExecStats.class.getName());
   }
@@ -803,10 +804,10 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getMemoryFieldBuilder();
-        getOutputFieldBuilder();
-        getReferencedTensorFieldBuilder();
-        getMemoryStatsFieldBuilder();
+        internalGetMemoryFieldBuilder();
+        internalGetOutputFieldBuilder();
+        internalGetReferencedTensorFieldBuilder();
+        internalGetMemoryStatsFieldBuilder();
       }
     }
     @java.lang.Override
@@ -1014,7 +1015,7 @@ public Builder mergeFrom(org.tensorflow.proto.NodeExecStats other) {
             bitField0_ = (bitField0_ & ~0x00000020);
             memoryBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getMemoryFieldBuilder() : null;
+                 internalGetMemoryFieldBuilder() : null;
           } else {
             memoryBuilder_.addAllMessages(other.memory_);
           }
@@ -1040,7 +1041,7 @@ public Builder mergeFrom(org.tensorflow.proto.NodeExecStats other) {
             bitField0_ = (bitField0_ & ~0x00000040);
             outputBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getOutputFieldBuilder() : null;
+                 internalGetOutputFieldBuilder() : null;
           } else {
             outputBuilder_.addAllMessages(other.output_);
           }
@@ -1077,7 +1078,7 @@ public Builder mergeFrom(org.tensorflow.proto.NodeExecStats other) {
             bitField0_ = (bitField0_ & ~0x00000400);
             referencedTensorBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getReferencedTensorFieldBuilder() : null;
+                 internalGetReferencedTensorFieldBuilder() : null;
           } else {
             referencedTensorBuilder_.addAllMessages(other.referencedTensor_);
           }
@@ -1208,7 +1209,7 @@ public Builder mergeFrom(
             } // case 90
             case 98: {
               input.readMessage(
-                  getMemoryStatsFieldBuilder().getBuilder(),
+                  internalGetMemoryStatsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000800;
               break;
@@ -1670,7 +1671,7 @@ public Builder removeMemory(int index) {
      */
     public org.tensorflow.proto.AllocatorMemoryUsed.Builder getMemoryBuilder(
         int index) {
-      return getMemoryFieldBuilder().getBuilder(index);
+      return internalGetMemoryFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.AllocatorMemoryUsed memory = 6;
@@ -1697,7 +1698,7 @@ public org.tensorflow.proto.AllocatorMemoryUsedOrBuilder getMemoryOrBuilder(
      * repeated .tensorflow.AllocatorMemoryUsed memory = 6;
      */
     public org.tensorflow.proto.AllocatorMemoryUsed.Builder addMemoryBuilder() {
-      return getMemoryFieldBuilder().addBuilder(
+      return internalGetMemoryFieldBuilder().addBuilder(
           org.tensorflow.proto.AllocatorMemoryUsed.getDefaultInstance());
     }
     /**
@@ -1705,7 +1706,7 @@ public org.tensorflow.proto.AllocatorMemoryUsed.Builder addMemoryBuilder() {
      */
     public org.tensorflow.proto.AllocatorMemoryUsed.Builder addMemoryBuilder(
         int index) {
-      return getMemoryFieldBuilder().addBuilder(
+      return internalGetMemoryFieldBuilder().addBuilder(
           index, org.tensorflow.proto.AllocatorMemoryUsed.getDefaultInstance());
     }
     /**
@@ -1713,11 +1714,11 @@ public org.tensorflow.proto.AllocatorMemoryUsed.Builder addMemoryBuilder(
      */
     public java.util.List 
          getMemoryBuilderList() {
-      return getMemoryFieldBuilder().getBuilderList();
+      return internalGetMemoryFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.AllocatorMemoryUsed, org.tensorflow.proto.AllocatorMemoryUsed.Builder, org.tensorflow.proto.AllocatorMemoryUsedOrBuilder> 
-        getMemoryFieldBuilder() {
+        internalGetMemoryFieldBuilder() {
       if (memoryBuilder_ == null) {
         memoryBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.AllocatorMemoryUsed, org.tensorflow.proto.AllocatorMemoryUsed.Builder, org.tensorflow.proto.AllocatorMemoryUsedOrBuilder>(
@@ -1910,7 +1911,7 @@ public Builder removeOutput(int index) {
      */
     public org.tensorflow.proto.NodeOutput.Builder getOutputBuilder(
         int index) {
-      return getOutputFieldBuilder().getBuilder(index);
+      return internalGetOutputFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.NodeOutput output = 7;
@@ -1937,7 +1938,7 @@ public org.tensorflow.proto.NodeOutputOrBuilder getOutputOrBuilder(
      * repeated .tensorflow.NodeOutput output = 7;
      */
     public org.tensorflow.proto.NodeOutput.Builder addOutputBuilder() {
-      return getOutputFieldBuilder().addBuilder(
+      return internalGetOutputFieldBuilder().addBuilder(
           org.tensorflow.proto.NodeOutput.getDefaultInstance());
     }
     /**
@@ -1945,7 +1946,7 @@ public org.tensorflow.proto.NodeOutput.Builder addOutputBuilder() {
      */
     public org.tensorflow.proto.NodeOutput.Builder addOutputBuilder(
         int index) {
-      return getOutputFieldBuilder().addBuilder(
+      return internalGetOutputFieldBuilder().addBuilder(
           index, org.tensorflow.proto.NodeOutput.getDefaultInstance());
     }
     /**
@@ -1953,11 +1954,11 @@ public org.tensorflow.proto.NodeOutput.Builder addOutputBuilder(
      */
     public java.util.List 
          getOutputBuilderList() {
-      return getOutputFieldBuilder().getBuilderList();
+      return internalGetOutputFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.NodeOutput, org.tensorflow.proto.NodeOutput.Builder, org.tensorflow.proto.NodeOutputOrBuilder> 
-        getOutputFieldBuilder() {
+        internalGetOutputFieldBuilder() {
       if (outputBuilder_ == null) {
         outputBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.NodeOutput, org.tensorflow.proto.NodeOutput.Builder, org.tensorflow.proto.NodeOutputOrBuilder>(
@@ -2286,7 +2287,7 @@ public Builder removeReferencedTensor(int index) {
      */
     public org.tensorflow.proto.AllocationDescription.Builder getReferencedTensorBuilder(
         int index) {
-      return getReferencedTensorFieldBuilder().getBuilder(index);
+      return internalGetReferencedTensorFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.AllocationDescription referenced_tensor = 11;
@@ -2313,7 +2314,7 @@ public org.tensorflow.proto.AllocationDescriptionOrBuilder getReferencedTensorOr
      * repeated .tensorflow.AllocationDescription referenced_tensor = 11;
      */
     public org.tensorflow.proto.AllocationDescription.Builder addReferencedTensorBuilder() {
-      return getReferencedTensorFieldBuilder().addBuilder(
+      return internalGetReferencedTensorFieldBuilder().addBuilder(
           org.tensorflow.proto.AllocationDescription.getDefaultInstance());
     }
     /**
@@ -2321,7 +2322,7 @@ public org.tensorflow.proto.AllocationDescription.Builder addReferencedTensorBui
      */
     public org.tensorflow.proto.AllocationDescription.Builder addReferencedTensorBuilder(
         int index) {
-      return getReferencedTensorFieldBuilder().addBuilder(
+      return internalGetReferencedTensorFieldBuilder().addBuilder(
           index, org.tensorflow.proto.AllocationDescription.getDefaultInstance());
     }
     /**
@@ -2329,11 +2330,11 @@ public org.tensorflow.proto.AllocationDescription.Builder addReferencedTensorBui
      */
     public java.util.List 
          getReferencedTensorBuilderList() {
-      return getReferencedTensorFieldBuilder().getBuilderList();
+      return internalGetReferencedTensorFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.AllocationDescription, org.tensorflow.proto.AllocationDescription.Builder, org.tensorflow.proto.AllocationDescriptionOrBuilder> 
-        getReferencedTensorFieldBuilder() {
+        internalGetReferencedTensorFieldBuilder() {
       if (referencedTensorBuilder_ == null) {
         referencedTensorBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.AllocationDescription, org.tensorflow.proto.AllocationDescription.Builder, org.tensorflow.proto.AllocationDescriptionOrBuilder>(
@@ -2437,7 +2438,7 @@ public Builder clearMemoryStats() {
     public org.tensorflow.proto.MemoryStats.Builder getMemoryStatsBuilder() {
       bitField0_ |= 0x00000800;
       onChanged();
-      return getMemoryStatsFieldBuilder().getBuilder();
+      return internalGetMemoryStatsFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.MemoryStats memory_stats = 12;
@@ -2455,7 +2456,7 @@ public org.tensorflow.proto.MemoryStatsOrBuilder getMemoryStatsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.MemoryStats, org.tensorflow.proto.MemoryStats.Builder, org.tensorflow.proto.MemoryStatsOrBuilder> 
-        getMemoryStatsFieldBuilder() {
+        internalGetMemoryStatsFieldBuilder() {
       if (memoryStatsBuilder_ == null) {
         memoryStatsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.MemoryStats, org.tensorflow.proto.MemoryStats.Builder, org.tensorflow.proto.MemoryStatsOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeExecStatsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeExecStatsOrBuilder.java
index 96407c0f8eb..8efcf2ec56c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeExecStatsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeExecStatsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface NodeExecStatsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.NodeExecStats)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeOutput.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeOutput.java
index d7d647f0d7c..c1c2dc52f5a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeOutput.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeOutput.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.NodeOutput}
  */
+@com.google.protobuf.Generated
 public final class NodeOutput extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.NodeOutput)
@@ -21,8 +22,8 @@ public final class NodeOutput extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NodeOutput.class.getName());
   }
@@ -294,7 +295,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorDescriptionFieldBuilder();
+        internalGetTensorDescriptionFieldBuilder();
       }
     }
     @java.lang.Override
@@ -404,7 +405,7 @@ public Builder mergeFrom(
             } // case 8
             case 26: {
               input.readMessage(
-                  getTensorDescriptionFieldBuilder().getBuilder(),
+                  internalGetTensorDescriptionFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -549,7 +550,7 @@ public Builder clearTensorDescription() {
     public org.tensorflow.proto.TensorDescription.Builder getTensorDescriptionBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getTensorDescriptionFieldBuilder().getBuilder();
+      return internalGetTensorDescriptionFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.TensorDescription tensor_description = 3;
@@ -567,7 +568,7 @@ public org.tensorflow.proto.TensorDescriptionOrBuilder getTensorDescriptionOrBui
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorDescription, org.tensorflow.proto.TensorDescription.Builder, org.tensorflow.proto.TensorDescriptionOrBuilder> 
-        getTensorDescriptionFieldBuilder() {
+        internalGetTensorDescriptionFieldBuilder() {
       if (tensorDescriptionBuilder_ == null) {
         tensorDescriptionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorDescription, org.tensorflow.proto.TensorDescription.Builder, org.tensorflow.proto.TensorDescriptionOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeOutputOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeOutputOrBuilder.java
index 544c48d05df..25a95789e0d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeOutputOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeOutputOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface NodeOutputOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.NodeOutput)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeProto.java
index 8e3f1a3aed9..9f0093a5875 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/NodeProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/node_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class NodeProto {
   private NodeProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NodeProto.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDef.java
index e24a3dd5e36..5ae8e38d07f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/op_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -14,6 +14,7 @@
  *
  * Protobuf type {@code tensorflow.OpDef}
  */
+@com.google.protobuf.Generated
 public final class OpDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.OpDef)
@@ -23,8 +24,8 @@ public final class OpDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       OpDef.class.getName());
   }
@@ -322,8 +323,8 @@ public static final class ArgDef extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ArgDef.class.getName());
     }
@@ -1060,8 +1061,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getHandleDataFieldBuilder();
-          getExperimentalFullTypeFieldBuilder();
+          internalGetHandleDataFieldBuilder();
+          internalGetExperimentalFullTypeFieldBuilder();
         }
       }
       @java.lang.Override
@@ -1224,7 +1225,7 @@ public Builder mergeFrom(org.tensorflow.proto.OpDef.ArgDef other) {
               bitField0_ = (bitField0_ & ~0x00000040);
               handleDataBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getHandleDataFieldBuilder() : null;
+                   internalGetHandleDataFieldBuilder() : null;
             } else {
               handleDataBuilder_.addAllMessages(other.handleData_);
             }
@@ -1312,7 +1313,7 @@ public Builder mergeFrom(
               } // case 128
               case 138: {
                 input.readMessage(
-                    getExperimentalFullTypeFieldBuilder().getBuilder(),
+                    internalGetExperimentalFullTypeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000100;
                 break;
@@ -1604,9 +1605,7 @@ public org.tensorflow.proto.DataType getType() {
        * @return This builder for chaining.
        */
       public Builder setType(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000004;
         type_ = value.getNumber();
         onChanged();
@@ -2149,7 +2148,7 @@ public Builder removeHandleData(int index) {
        */
       public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder getHandleDataBuilder(
           int index) {
-        return getHandleDataFieldBuilder().getBuilder(index);
+        return internalGetHandleDataFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -2188,7 +2187,7 @@ public org.tensorflow.proto.ResourceHandleProto.DtypeAndShapeOrBuilder getHandle
        * repeated .tensorflow.ResourceHandleProto.DtypeAndShape handle_data = 7;
        */
       public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder addHandleDataBuilder() {
-        return getHandleDataFieldBuilder().addBuilder(
+        return internalGetHandleDataFieldBuilder().addBuilder(
             org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.getDefaultInstance());
       }
       /**
@@ -2200,7 +2199,7 @@ public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder addHandleD
        */
       public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder addHandleDataBuilder(
           int index) {
-        return getHandleDataFieldBuilder().addBuilder(
+        return internalGetHandleDataFieldBuilder().addBuilder(
             index, org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.getDefaultInstance());
       }
       /**
@@ -2212,11 +2211,11 @@ public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder addHandleD
        */
       public java.util.List 
            getHandleDataBuilderList() {
-        return getHandleDataFieldBuilder().getBuilderList();
+        return internalGetHandleDataFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.ResourceHandleProto.DtypeAndShape, org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder, org.tensorflow.proto.ResourceHandleProto.DtypeAndShapeOrBuilder> 
-          getHandleDataFieldBuilder() {
+          internalGetHandleDataFieldBuilder() {
         if (handleDataBuilder_ == null) {
           handleDataBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.ResourceHandleProto.DtypeAndShape, org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder, org.tensorflow.proto.ResourceHandleProto.DtypeAndShapeOrBuilder>(
@@ -2454,7 +2453,7 @@ public Builder clearExperimentalFullType() {
       public org.tensorflow.proto.FullTypeDef.Builder getExperimentalFullTypeBuilder() {
         bitField0_ |= 0x00000100;
         onChanged();
-        return getExperimentalFullTypeFieldBuilder().getBuilder();
+        return internalGetExperimentalFullTypeFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -2496,7 +2495,7 @@ public org.tensorflow.proto.FullTypeDefOrBuilder getExperimentalFullTypeOrBuilde
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.FullTypeDef, org.tensorflow.proto.FullTypeDef.Builder, org.tensorflow.proto.FullTypeDefOrBuilder> 
-          getExperimentalFullTypeFieldBuilder() {
+          internalGetExperimentalFullTypeFieldBuilder() {
         if (experimentalFullTypeBuilder_ == null) {
           experimentalFullTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.FullTypeDef, org.tensorflow.proto.FullTypeDef.Builder, org.tensorflow.proto.FullTypeDefOrBuilder>(
@@ -2736,8 +2735,8 @@ public static final class AttrDef extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         AttrDef.class.getName());
     }
@@ -3304,8 +3303,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getDefaultValueFieldBuilder();
-          getAllowedValuesFieldBuilder();
+          internalGetDefaultValueFieldBuilder();
+          internalGetAllowedValuesFieldBuilder();
         }
       }
       @java.lang.Override
@@ -3468,7 +3467,7 @@ public Builder mergeFrom(
               } // case 18
               case 26: {
                 input.readMessage(
-                    getDefaultValueFieldBuilder().getBuilder(),
+                    internalGetDefaultValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -3490,7 +3489,7 @@ public Builder mergeFrom(
               } // case 48
               case 58: {
                 input.readMessage(
-                    getAllowedValuesFieldBuilder().getBuilder(),
+                    internalGetAllowedValuesFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000040;
                 break;
@@ -3837,7 +3836,7 @@ public Builder clearDefaultValue() {
       public org.tensorflow.proto.AttrValue.Builder getDefaultValueBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getDefaultValueFieldBuilder().getBuilder();
+        return internalGetDefaultValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3865,7 +3864,7 @@ public org.tensorflow.proto.AttrValueOrBuilder getDefaultValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.AttrValue, org.tensorflow.proto.AttrValue.Builder, org.tensorflow.proto.AttrValueOrBuilder> 
-          getDefaultValueFieldBuilder() {
+          internalGetDefaultValueFieldBuilder() {
         if (defaultValueBuilder_ == null) {
           defaultValueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.AttrValue, org.tensorflow.proto.AttrValue.Builder, org.tensorflow.proto.AttrValueOrBuilder>(
@@ -4202,7 +4201,7 @@ public Builder clearAllowedValues() {
       public org.tensorflow.proto.AttrValue.Builder getAllowedValuesBuilder() {
         bitField0_ |= 0x00000040;
         onChanged();
-        return getAllowedValuesFieldBuilder().getBuilder();
+        return internalGetAllowedValuesFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -4238,7 +4237,7 @@ public org.tensorflow.proto.AttrValueOrBuilder getAllowedValuesOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.AttrValue, org.tensorflow.proto.AttrValue.Builder, org.tensorflow.proto.AttrValueOrBuilder> 
-          getAllowedValuesFieldBuilder() {
+          internalGetAllowedValuesFieldBuilder() {
         if (allowedValuesBuilder_ == null) {
           allowedValuesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.AttrValue, org.tensorflow.proto.AttrValue.Builder, org.tensorflow.proto.AttrValueOrBuilder>(
@@ -5147,10 +5146,10 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getInputArgFieldBuilder();
-        getOutputArgFieldBuilder();
-        getAttrFieldBuilder();
-        getDeprecationFieldBuilder();
+        internalGetInputArgFieldBuilder();
+        internalGetOutputArgFieldBuilder();
+        internalGetAttrFieldBuilder();
+        internalGetDeprecationFieldBuilder();
       }
     }
     @java.lang.Override
@@ -5332,7 +5331,7 @@ public Builder mergeFrom(org.tensorflow.proto.OpDef other) {
             bitField0_ = (bitField0_ & ~0x00000002);
             inputArgBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getInputArgFieldBuilder() : null;
+                 internalGetInputArgFieldBuilder() : null;
           } else {
             inputArgBuilder_.addAllMessages(other.inputArg_);
           }
@@ -5358,7 +5357,7 @@ public Builder mergeFrom(org.tensorflow.proto.OpDef other) {
             bitField0_ = (bitField0_ & ~0x00000004);
             outputArgBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getOutputArgFieldBuilder() : null;
+                 internalGetOutputArgFieldBuilder() : null;
           } else {
             outputArgBuilder_.addAllMessages(other.outputArg_);
           }
@@ -5394,7 +5393,7 @@ public Builder mergeFrom(org.tensorflow.proto.OpDef other) {
             bitField0_ = (bitField0_ & ~0x00000010);
             attrBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getAttrFieldBuilder() : null;
+                 internalGetAttrFieldBuilder() : null;
           } else {
             attrBuilder_.addAllMessages(other.attr_);
           }
@@ -5510,7 +5509,7 @@ public Builder mergeFrom(
             } // case 50
             case 66: {
               input.readMessage(
-                  getDeprecationFieldBuilder().getBuilder(),
+                  internalGetDeprecationFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000020;
               break;
@@ -5892,7 +5891,7 @@ public Builder removeInputArg(int index) {
      */
     public org.tensorflow.proto.OpDef.ArgDef.Builder getInputArgBuilder(
         int index) {
-      return getInputArgFieldBuilder().getBuilder(index);
+      return internalGetInputArgFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -5931,7 +5930,7 @@ public org.tensorflow.proto.OpDef.ArgDefOrBuilder getInputArgOrBuilder(
      * repeated .tensorflow.OpDef.ArgDef input_arg = 2;
      */
     public org.tensorflow.proto.OpDef.ArgDef.Builder addInputArgBuilder() {
-      return getInputArgFieldBuilder().addBuilder(
+      return internalGetInputArgFieldBuilder().addBuilder(
           org.tensorflow.proto.OpDef.ArgDef.getDefaultInstance());
     }
     /**
@@ -5943,7 +5942,7 @@ public org.tensorflow.proto.OpDef.ArgDef.Builder addInputArgBuilder() {
      */
     public org.tensorflow.proto.OpDef.ArgDef.Builder addInputArgBuilder(
         int index) {
-      return getInputArgFieldBuilder().addBuilder(
+      return internalGetInputArgFieldBuilder().addBuilder(
           index, org.tensorflow.proto.OpDef.ArgDef.getDefaultInstance());
     }
     /**
@@ -5955,11 +5954,11 @@ public org.tensorflow.proto.OpDef.ArgDef.Builder addInputArgBuilder(
      */
     public java.util.List 
          getInputArgBuilderList() {
-      return getInputArgFieldBuilder().getBuilderList();
+      return internalGetInputArgFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.OpDef.ArgDef, org.tensorflow.proto.OpDef.ArgDef.Builder, org.tensorflow.proto.OpDef.ArgDefOrBuilder> 
-        getInputArgFieldBuilder() {
+        internalGetInputArgFieldBuilder() {
       if (inputArgBuilder_ == null) {
         inputArgBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.OpDef.ArgDef, org.tensorflow.proto.OpDef.ArgDef.Builder, org.tensorflow.proto.OpDef.ArgDefOrBuilder>(
@@ -6204,7 +6203,7 @@ public Builder removeOutputArg(int index) {
      */
     public org.tensorflow.proto.OpDef.ArgDef.Builder getOutputArgBuilder(
         int index) {
-      return getOutputArgFieldBuilder().getBuilder(index);
+      return internalGetOutputArgFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -6243,7 +6242,7 @@ public org.tensorflow.proto.OpDef.ArgDefOrBuilder getOutputArgOrBuilder(
      * repeated .tensorflow.OpDef.ArgDef output_arg = 3;
      */
     public org.tensorflow.proto.OpDef.ArgDef.Builder addOutputArgBuilder() {
-      return getOutputArgFieldBuilder().addBuilder(
+      return internalGetOutputArgFieldBuilder().addBuilder(
           org.tensorflow.proto.OpDef.ArgDef.getDefaultInstance());
     }
     /**
@@ -6255,7 +6254,7 @@ public org.tensorflow.proto.OpDef.ArgDef.Builder addOutputArgBuilder() {
      */
     public org.tensorflow.proto.OpDef.ArgDef.Builder addOutputArgBuilder(
         int index) {
-      return getOutputArgFieldBuilder().addBuilder(
+      return internalGetOutputArgFieldBuilder().addBuilder(
           index, org.tensorflow.proto.OpDef.ArgDef.getDefaultInstance());
     }
     /**
@@ -6267,11 +6266,11 @@ public org.tensorflow.proto.OpDef.ArgDef.Builder addOutputArgBuilder(
      */
     public java.util.List 
          getOutputArgBuilderList() {
-      return getOutputArgFieldBuilder().getBuilderList();
+      return internalGetOutputArgFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.OpDef.ArgDef, org.tensorflow.proto.OpDef.ArgDef.Builder, org.tensorflow.proto.OpDef.ArgDefOrBuilder> 
-        getOutputArgFieldBuilder() {
+        internalGetOutputArgFieldBuilder() {
       if (outputArgBuilder_ == null) {
         outputArgBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.OpDef.ArgDef, org.tensorflow.proto.OpDef.ArgDef.Builder, org.tensorflow.proto.OpDef.ArgDefOrBuilder>(
@@ -6620,7 +6619,7 @@ public Builder removeAttr(int index) {
      */
     public org.tensorflow.proto.OpDef.AttrDef.Builder getAttrBuilder(
         int index) {
-      return getAttrFieldBuilder().getBuilder(index);
+      return internalGetAttrFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.OpDef.AttrDef attr = 4;
@@ -6647,7 +6646,7 @@ public org.tensorflow.proto.OpDef.AttrDefOrBuilder getAttrOrBuilder(
      * repeated .tensorflow.OpDef.AttrDef attr = 4;
      */
     public org.tensorflow.proto.OpDef.AttrDef.Builder addAttrBuilder() {
-      return getAttrFieldBuilder().addBuilder(
+      return internalGetAttrFieldBuilder().addBuilder(
           org.tensorflow.proto.OpDef.AttrDef.getDefaultInstance());
     }
     /**
@@ -6655,7 +6654,7 @@ public org.tensorflow.proto.OpDef.AttrDef.Builder addAttrBuilder() {
      */
     public org.tensorflow.proto.OpDef.AttrDef.Builder addAttrBuilder(
         int index) {
-      return getAttrFieldBuilder().addBuilder(
+      return internalGetAttrFieldBuilder().addBuilder(
           index, org.tensorflow.proto.OpDef.AttrDef.getDefaultInstance());
     }
     /**
@@ -6663,11 +6662,11 @@ public org.tensorflow.proto.OpDef.AttrDef.Builder addAttrBuilder(
      */
     public java.util.List 
          getAttrBuilderList() {
-      return getAttrFieldBuilder().getBuilderList();
+      return internalGetAttrFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.OpDef.AttrDef, org.tensorflow.proto.OpDef.AttrDef.Builder, org.tensorflow.proto.OpDef.AttrDefOrBuilder> 
-        getAttrFieldBuilder() {
+        internalGetAttrFieldBuilder() {
       if (attrBuilder_ == null) {
         attrBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.OpDef.AttrDef, org.tensorflow.proto.OpDef.AttrDef.Builder, org.tensorflow.proto.OpDef.AttrDefOrBuilder>(
@@ -6799,7 +6798,7 @@ public Builder clearDeprecation() {
     public org.tensorflow.proto.OpDeprecation.Builder getDeprecationBuilder() {
       bitField0_ |= 0x00000020;
       onChanged();
-      return getDeprecationFieldBuilder().getBuilder();
+      return internalGetDeprecationFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -6825,7 +6824,7 @@ public org.tensorflow.proto.OpDeprecationOrBuilder getDeprecationOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.OpDeprecation, org.tensorflow.proto.OpDeprecation.Builder, org.tensorflow.proto.OpDeprecationOrBuilder> 
-        getDeprecationFieldBuilder() {
+        internalGetDeprecationFieldBuilder() {
       if (deprecationBuilder_ == null) {
         deprecationBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.OpDeprecation, org.tensorflow.proto.OpDeprecation.Builder, org.tensorflow.proto.OpDeprecationOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDefOrBuilder.java
index 598ed6ae27c..188bc64caeb 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/op_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface OpDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.OpDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDefProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDefProtos.java
index a840147d89e..80ff14300cf 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDefProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDefProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/op_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class OpDefProtos {
   private OpDefProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       OpDefProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDeprecation.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDeprecation.java
index 984020421f7..58c2bc66b27 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDeprecation.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDeprecation.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/op_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.OpDeprecation}
  */
+@com.google.protobuf.Generated
 public final class OpDeprecation extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.OpDeprecation)
@@ -21,8 +22,8 @@ public final class OpDeprecation extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       OpDeprecation.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDeprecationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDeprecationOrBuilder.java
index e88fe5daf67..767d33998c2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDeprecationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpDeprecationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/op_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface OpDeprecationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.OpDeprecation)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpList.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpList.java
index 6af1a400c7c..3692219e0f4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpList.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpList.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/op_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.OpList}
  */
+@com.google.protobuf.Generated
 public final class OpList extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.OpList)
@@ -21,8 +22,8 @@ public final class OpList extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       OpList.class.getName());
   }
@@ -372,7 +373,7 @@ public Builder mergeFrom(org.tensorflow.proto.OpList other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             opBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getOpFieldBuilder() : null;
+                 internalGetOpFieldBuilder() : null;
           } else {
             opBuilder_.addAllMessages(other.op_);
           }
@@ -614,7 +615,7 @@ public Builder removeOp(int index) {
      */
     public org.tensorflow.proto.OpDef.Builder getOpBuilder(
         int index) {
-      return getOpFieldBuilder().getBuilder(index);
+      return internalGetOpFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.OpDef op = 1;
@@ -641,7 +642,7 @@ public org.tensorflow.proto.OpDefOrBuilder getOpOrBuilder(
      * repeated .tensorflow.OpDef op = 1;
      */
     public org.tensorflow.proto.OpDef.Builder addOpBuilder() {
-      return getOpFieldBuilder().addBuilder(
+      return internalGetOpFieldBuilder().addBuilder(
           org.tensorflow.proto.OpDef.getDefaultInstance());
     }
     /**
@@ -649,7 +650,7 @@ public org.tensorflow.proto.OpDef.Builder addOpBuilder() {
      */
     public org.tensorflow.proto.OpDef.Builder addOpBuilder(
         int index) {
-      return getOpFieldBuilder().addBuilder(
+      return internalGetOpFieldBuilder().addBuilder(
           index, org.tensorflow.proto.OpDef.getDefaultInstance());
     }
     /**
@@ -657,11 +658,11 @@ public org.tensorflow.proto.OpDef.Builder addOpBuilder(
      */
     public java.util.List 
          getOpBuilderList() {
-      return getOpFieldBuilder().getBuilderList();
+      return internalGetOpFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.OpDef, org.tensorflow.proto.OpDef.Builder, org.tensorflow.proto.OpDefOrBuilder> 
-        getOpFieldBuilder() {
+        internalGetOpFieldBuilder() {
       if (opBuilder_ == null) {
         opBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.OpDef, org.tensorflow.proto.OpDef.Builder, org.tensorflow.proto.OpDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpListOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpListOrBuilder.java
index 5e13bc021f6..ac44459fe5c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpListOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpListOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/op_def.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface OpListOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.OpList)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpPerformanceData.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpPerformanceData.java
index a6c88007b41..2f79bf0f068 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpPerformanceData.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OpPerformanceData.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/grappler/costs/op_performance_data.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class OpPerformanceData {
   private OpPerformanceData() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       OpPerformanceData.class.getName());
   }
@@ -51,8 +52,8 @@ public static final class SessionInfo extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SessionInfo.class.getName());
     }
@@ -685,8 +686,8 @@ public static final class OpInfo extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         OpInfo.class.getName());
     }
@@ -786,8 +787,8 @@ public static final class TensorProperties extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           TensorProperties.class.getName());
       }
@@ -1108,8 +1109,8 @@ private Builder(
         private void maybeForceBuilderInitialization() {
           if (com.google.protobuf.GeneratedMessage
                   .alwaysUseFieldBuilders) {
-            getShapeFieldBuilder();
-            getValueFieldBuilder();
+            internalGetShapeFieldBuilder();
+            internalGetValueFieldBuilder();
           }
         }
         @java.lang.Override
@@ -1233,14 +1234,14 @@ public Builder mergeFrom(
                 } // case 8
                 case 18: {
                   input.readMessage(
-                      getShapeFieldBuilder().getBuilder(),
+                      internalGetShapeFieldBuilder().getBuilder(),
                       extensionRegistry);
                   bitField0_ |= 0x00000002;
                   break;
                 } // case 18
                 case 26: {
                   input.readMessage(
-                      getValueFieldBuilder().getBuilder(),
+                      internalGetValueFieldBuilder().getBuilder(),
                       extensionRegistry);
                   bitField0_ |= 0x00000004;
                   break;
@@ -1296,9 +1297,7 @@ public org.tensorflow.proto.DataType getDtype() {
          * @return This builder for chaining.
          */
         public Builder setDtype(org.tensorflow.proto.DataType value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00000001;
           dtype_ = value.getNumber();
           onChanged();
@@ -1406,7 +1405,7 @@ public Builder clearShape() {
         public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
-          return getShapeFieldBuilder().getBuilder();
+          return internalGetShapeFieldBuilder().getBuilder();
         }
         /**
          * .tensorflow.TensorShapeProto shape = 2;
@@ -1424,7 +1423,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
          */
         private com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-            getShapeFieldBuilder() {
+            internalGetShapeFieldBuilder() {
           if (shapeBuilder_ == null) {
             shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                 org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -1527,7 +1526,7 @@ public Builder clearValue() {
         public org.tensorflow.proto.TensorProto.Builder getValueBuilder() {
           bitField0_ |= 0x00000004;
           onChanged();
-          return getValueFieldBuilder().getBuilder();
+          return internalGetValueFieldBuilder().getBuilder();
         }
         /**
          * .tensorflow.TensorProto value = 3;
@@ -1545,7 +1544,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getValueOrBuilder() {
          */
         private com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-            getValueFieldBuilder() {
+            internalGetValueFieldBuilder() {
           if (valueBuilder_ == null) {
             valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                 org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
@@ -2225,10 +2224,10 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getInputsFieldBuilder();
-          getOutputsFieldBuilder();
-          getDeviceFieldBuilder();
-          getSessionInfoFieldBuilder();
+          internalGetInputsFieldBuilder();
+          internalGetOutputsFieldBuilder();
+          internalGetDeviceFieldBuilder();
+          internalGetSessionInfoFieldBuilder();
         }
       }
       @java.lang.Override
@@ -2378,7 +2377,7 @@ public Builder mergeFrom(org.tensorflow.proto.OpPerformanceData.OpInfo other) {
               bitField0_ = (bitField0_ & ~0x00000004);
               inputsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getInputsFieldBuilder() : null;
+                   internalGetInputsFieldBuilder() : null;
             } else {
               inputsBuilder_.addAllMessages(other.inputs_);
             }
@@ -2404,7 +2403,7 @@ public Builder mergeFrom(org.tensorflow.proto.OpPerformanceData.OpInfo other) {
               bitField0_ = (bitField0_ & ~0x00000008);
               outputsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getOutputsFieldBuilder() : null;
+                   internalGetOutputsFieldBuilder() : null;
             } else {
               outputsBuilder_.addAllMessages(other.outputs_);
             }
@@ -2471,7 +2470,7 @@ public Builder mergeFrom(
               } // case 26
               case 34: {
                 input.readMessage(
-                    getDeviceFieldBuilder().getBuilder(),
+                    internalGetDeviceFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000010;
                 break;
@@ -2491,7 +2490,7 @@ public Builder mergeFrom(
               } // case 42
               case 50: {
                 input.readMessage(
-                    getSessionInfoFieldBuilder().getBuilder(),
+                    internalGetSessionInfoFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000020;
                 break;
@@ -2972,7 +2971,7 @@ public Builder removeInputs(int index) {
        */
       public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder getInputsBuilder(
           int index) {
-        return getInputsFieldBuilder().getBuilder(index);
+        return internalGetInputsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.OpInfo.TensorProperties inputs = 3;
@@ -2999,7 +2998,7 @@ public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorPropertiesOrBuilder g
        * repeated .tensorflow.OpInfo.TensorProperties inputs = 3;
        */
       public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder addInputsBuilder() {
-        return getInputsFieldBuilder().addBuilder(
+        return internalGetInputsFieldBuilder().addBuilder(
             org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.getDefaultInstance());
       }
       /**
@@ -3007,7 +3006,7 @@ public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder ad
        */
       public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder addInputsBuilder(
           int index) {
-        return getInputsFieldBuilder().addBuilder(
+        return internalGetInputsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.getDefaultInstance());
       }
       /**
@@ -3015,11 +3014,11 @@ public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder ad
        */
       public java.util.List 
            getInputsBuilderList() {
-        return getInputsFieldBuilder().getBuilderList();
+        return internalGetInputsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorPropertiesOrBuilder> 
-          getInputsFieldBuilder() {
+          internalGetInputsFieldBuilder() {
         if (inputsBuilder_ == null) {
           inputsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorPropertiesOrBuilder>(
@@ -3264,7 +3263,7 @@ public Builder removeOutputs(int index) {
        */
       public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder getOutputsBuilder(
           int index) {
-        return getOutputsFieldBuilder().getBuilder(index);
+        return internalGetOutputsFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -3303,7 +3302,7 @@ public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorPropertiesOrBuilder g
        * repeated .tensorflow.OpInfo.TensorProperties outputs = 5;
        */
       public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder addOutputsBuilder() {
-        return getOutputsFieldBuilder().addBuilder(
+        return internalGetOutputsFieldBuilder().addBuilder(
             org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.getDefaultInstance());
       }
       /**
@@ -3315,7 +3314,7 @@ public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder ad
        */
       public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder addOutputsBuilder(
           int index) {
-        return getOutputsFieldBuilder().addBuilder(
+        return internalGetOutputsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.getDefaultInstance());
       }
       /**
@@ -3327,11 +3326,11 @@ public org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder ad
        */
       public java.util.List 
            getOutputsBuilderList() {
-        return getOutputsFieldBuilder().getBuilderList();
+        return internalGetOutputsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorPropertiesOrBuilder> 
-          getOutputsFieldBuilder() {
+          internalGetOutputsFieldBuilder() {
         if (outputsBuilder_ == null) {
           outputsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorProperties.Builder, org.tensorflow.proto.OpPerformanceData.OpInfo.TensorPropertiesOrBuilder>(
@@ -3463,7 +3462,7 @@ public Builder clearDevice() {
       public org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties.Builder getDeviceBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
-        return getDeviceFieldBuilder().getBuilder();
+        return internalGetDeviceFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3489,7 +3488,7 @@ public org.tensorflow.proto.DevicePropertiesProtos.DevicePropertiesOrBuilder get
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties, org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties.Builder, org.tensorflow.proto.DevicePropertiesProtos.DevicePropertiesOrBuilder> 
-          getDeviceFieldBuilder() {
+          internalGetDeviceFieldBuilder() {
         if (deviceBuilder_ == null) {
           deviceBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties, org.tensorflow.proto.DevicePropertiesProtos.DeviceProperties.Builder, org.tensorflow.proto.DevicePropertiesProtos.DevicePropertiesOrBuilder>(
@@ -3620,7 +3619,7 @@ public Builder clearSessionInfo() {
       public org.tensorflow.proto.OpPerformanceData.SessionInfo.Builder getSessionInfoBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
-        return getSessionInfoFieldBuilder().getBuilder();
+        return internalGetSessionInfoFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3646,7 +3645,7 @@ public org.tensorflow.proto.OpPerformanceData.SessionInfoOrBuilder getSessionInf
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.SessionInfo, org.tensorflow.proto.OpPerformanceData.SessionInfo.Builder, org.tensorflow.proto.OpPerformanceData.SessionInfoOrBuilder> 
-          getSessionInfoFieldBuilder() {
+          internalGetSessionInfoFieldBuilder() {
         if (sessionInfoBuilder_ == null) {
           sessionInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.OpPerformanceData.SessionInfo, org.tensorflow.proto.OpPerformanceData.SessionInfo.Builder, org.tensorflow.proto.OpPerformanceData.SessionInfoOrBuilder>(
@@ -3737,8 +3736,8 @@ public static final class NormalDistribution extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NormalDistribution.class.getName());
     }
@@ -4045,10 +4044,10 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(org.tensorflow.proto.OpPerformanceData.NormalDistribution other) {
         if (other == org.tensorflow.proto.OpPerformanceData.NormalDistribution.getDefaultInstance()) return this;
-        if (other.getMu() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getMu()) != 0) {
           setMu(other.getMu());
         }
-        if (other.getSigma() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getSigma()) != 0) {
           setSigma(other.getSigma());
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -4247,8 +4246,8 @@ public static final class LogNormalDistribution extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         LogNormalDistribution.class.getName());
     }
@@ -4555,10 +4554,10 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(org.tensorflow.proto.OpPerformanceData.LogNormalDistribution other) {
         if (other == org.tensorflow.proto.OpPerformanceData.LogNormalDistribution.getDefaultInstance()) return this;
-        if (other.getMu() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getMu()) != 0) {
           setMu(other.getMu());
         }
-        if (other.getSigma() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getSigma()) != 0) {
           setSigma(other.getSigma());
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -4936,8 +4935,8 @@ public static final class OpPerformance extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         OpPerformance.class.getName());
     }
@@ -5043,8 +5042,8 @@ public static final class OpMemory extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           OpMemory.class.getName());
       }
@@ -6612,9 +6611,9 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getOpFieldBuilder();
-          getSessionInfoFieldBuilder();
-          getOpMemoryFieldBuilder();
+          internalGetOpFieldBuilder();
+          internalGetSessionInfoFieldBuilder();
+          internalGetOpMemoryFieldBuilder();
         }
       }
       @java.lang.Override
@@ -6776,10 +6775,10 @@ public Builder mergeFrom(org.tensorflow.proto.OpPerformanceData.OpPerformance ot
         if (other.getMemoryTime() != 0L) {
           setMemoryTime(other.getMemoryTime());
         }
-        if (other.getComputeEfficiency() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getComputeEfficiency()) != 0) {
           setComputeEfficiency(other.getComputeEfficiency());
         }
-        if (other.getMemoryEfficiency() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getMemoryEfficiency()) != 0) {
           setMemoryEfficiency(other.getMemoryEfficiency());
         }
         if (other.hasOpMemory()) {
@@ -6826,7 +6825,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getOpFieldBuilder().getBuilder(),
+                    internalGetOpFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -6868,28 +6867,28 @@ public Builder mergeFrom(
               } // case 65
               case 74: {
                 input.readMessage(
-                    getOpMemoryFieldBuilder().getBuilder(),
+                    internalGetOpMemoryFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000800;
                 break;
               } // case 74
               case 82: {
                 input.readMessage(
-                    getExecutionTimeNormalFieldBuilder().getBuilder(),
+                    internalGetExecutionTimeNormalFieldBuilder().getBuilder(),
                     extensionRegistry);
                 executionTimeCase_ = 10;
                 break;
               } // case 82
               case 90: {
                 input.readMessage(
-                    getExecutionTimeLogNormalFieldBuilder().getBuilder(),
+                    internalGetExecutionTimeLogNormalFieldBuilder().getBuilder(),
                     extensionRegistry);
                 executionTimeCase_ = 11;
                 break;
               } // case 90
               case 98: {
                 input.readMessage(
-                    getSessionInfoFieldBuilder().getBuilder(),
+                    internalGetSessionInfoFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -7045,7 +7044,7 @@ public Builder clearOp() {
       public org.tensorflow.proto.OpPerformanceData.OpInfo.Builder getOpBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getOpFieldBuilder().getBuilder();
+        return internalGetOpFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -7071,7 +7070,7 @@ public org.tensorflow.proto.OpPerformanceData.OpInfoOrBuilder getOpOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.OpInfo, org.tensorflow.proto.OpPerformanceData.OpInfo.Builder, org.tensorflow.proto.OpPerformanceData.OpInfoOrBuilder> 
-          getOpFieldBuilder() {
+          internalGetOpFieldBuilder() {
         if (opBuilder_ == null) {
           opBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.OpPerformanceData.OpInfo, org.tensorflow.proto.OpPerformanceData.OpInfo.Builder, org.tensorflow.proto.OpPerformanceData.OpInfoOrBuilder>(
@@ -7206,7 +7205,7 @@ public org.tensorflow.proto.OpPerformanceData.OpInfoOrBuilder getOpOrBuilder() {
       @java.lang.Deprecated public org.tensorflow.proto.OpPerformanceData.SessionInfo.Builder getSessionInfoBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getSessionInfoFieldBuilder().getBuilder();
+        return internalGetSessionInfoFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -7232,7 +7231,7 @@ public org.tensorflow.proto.OpPerformanceData.OpInfoOrBuilder getOpOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.SessionInfo, org.tensorflow.proto.OpPerformanceData.SessionInfo.Builder, org.tensorflow.proto.OpPerformanceData.SessionInfoOrBuilder> 
-          getSessionInfoFieldBuilder() {
+          internalGetSessionInfoFieldBuilder() {
         if (sessionInfoBuilder_ == null) {
           sessionInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.OpPerformanceData.SessionInfo, org.tensorflow.proto.OpPerformanceData.SessionInfo.Builder, org.tensorflow.proto.OpPerformanceData.SessionInfoOrBuilder>(
@@ -7709,7 +7708,7 @@ public Builder clearExecutionTimeNormal() {
        * .tensorflow.NormalDistribution execution_time_normal = 10;
        */
       public org.tensorflow.proto.OpPerformanceData.NormalDistribution.Builder getExecutionTimeNormalBuilder() {
-        return getExecutionTimeNormalFieldBuilder().getBuilder();
+        return internalGetExecutionTimeNormalFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.NormalDistribution execution_time_normal = 10;
@@ -7730,7 +7729,7 @@ public org.tensorflow.proto.OpPerformanceData.NormalDistributionOrBuilder getExe
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.NormalDistribution, org.tensorflow.proto.OpPerformanceData.NormalDistribution.Builder, org.tensorflow.proto.OpPerformanceData.NormalDistributionOrBuilder> 
-          getExecutionTimeNormalFieldBuilder() {
+          internalGetExecutionTimeNormalFieldBuilder() {
         if (executionTimeNormalBuilder_ == null) {
           if (!(executionTimeCase_ == 10)) {
             executionTime_ = org.tensorflow.proto.OpPerformanceData.NormalDistribution.getDefaultInstance();
@@ -7851,7 +7850,7 @@ public Builder clearExecutionTimeLogNormal() {
        * .tensorflow.LogNormalDistribution execution_time_log_normal = 11;
        */
       public org.tensorflow.proto.OpPerformanceData.LogNormalDistribution.Builder getExecutionTimeLogNormalBuilder() {
-        return getExecutionTimeLogNormalFieldBuilder().getBuilder();
+        return internalGetExecutionTimeLogNormalFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.LogNormalDistribution execution_time_log_normal = 11;
@@ -7872,7 +7871,7 @@ public org.tensorflow.proto.OpPerformanceData.LogNormalDistributionOrBuilder get
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.LogNormalDistribution, org.tensorflow.proto.OpPerformanceData.LogNormalDistribution.Builder, org.tensorflow.proto.OpPerformanceData.LogNormalDistributionOrBuilder> 
-          getExecutionTimeLogNormalFieldBuilder() {
+          internalGetExecutionTimeLogNormalFieldBuilder() {
         if (executionTimeLogNormalBuilder_ == null) {
           if (!(executionTimeCase_ == 11)) {
             executionTime_ = org.tensorflow.proto.OpPerformanceData.LogNormalDistribution.getDefaultInstance();
@@ -7980,7 +7979,7 @@ public Builder clearOpMemory() {
       public org.tensorflow.proto.OpPerformanceData.OpPerformance.OpMemory.Builder getOpMemoryBuilder() {
         bitField0_ |= 0x00000800;
         onChanged();
-        return getOpMemoryFieldBuilder().getBuilder();
+        return internalGetOpMemoryFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.OpPerformance.OpMemory op_memory = 9;
@@ -7998,7 +7997,7 @@ public org.tensorflow.proto.OpPerformanceData.OpPerformance.OpMemoryOrBuilder ge
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.OpPerformance.OpMemory, org.tensorflow.proto.OpPerformanceData.OpPerformance.OpMemory.Builder, org.tensorflow.proto.OpPerformanceData.OpPerformance.OpMemoryOrBuilder> 
-          getOpMemoryFieldBuilder() {
+          internalGetOpMemoryFieldBuilder() {
         if (opMemoryBuilder_ == null) {
           opMemoryBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.OpPerformanceData.OpPerformance.OpMemory, org.tensorflow.proto.OpPerformanceData.OpPerformance.OpMemory.Builder, org.tensorflow.proto.OpPerformanceData.OpPerformance.OpMemoryOrBuilder>(
@@ -8105,8 +8104,8 @@ public static final class OpPerformanceList extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         OpPerformanceList.class.getName());
     }
@@ -8456,7 +8455,7 @@ public Builder mergeFrom(org.tensorflow.proto.OpPerformanceData.OpPerformanceLis
               bitField0_ = (bitField0_ & ~0x00000001);
               opPerformanceBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getOpPerformanceFieldBuilder() : null;
+                   internalGetOpPerformanceFieldBuilder() : null;
             } else {
               opPerformanceBuilder_.addAllMessages(other.opPerformance_);
             }
@@ -8698,7 +8697,7 @@ public Builder removeOpPerformance(int index) {
        */
       public org.tensorflow.proto.OpPerformanceData.OpPerformance.Builder getOpPerformanceBuilder(
           int index) {
-        return getOpPerformanceFieldBuilder().getBuilder(index);
+        return internalGetOpPerformanceFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.OpPerformance op_performance = 1;
@@ -8725,7 +8724,7 @@ public org.tensorflow.proto.OpPerformanceData.OpPerformanceOrBuilder getOpPerfor
        * repeated .tensorflow.OpPerformance op_performance = 1;
        */
       public org.tensorflow.proto.OpPerformanceData.OpPerformance.Builder addOpPerformanceBuilder() {
-        return getOpPerformanceFieldBuilder().addBuilder(
+        return internalGetOpPerformanceFieldBuilder().addBuilder(
             org.tensorflow.proto.OpPerformanceData.OpPerformance.getDefaultInstance());
       }
       /**
@@ -8733,7 +8732,7 @@ public org.tensorflow.proto.OpPerformanceData.OpPerformance.Builder addOpPerform
        */
       public org.tensorflow.proto.OpPerformanceData.OpPerformance.Builder addOpPerformanceBuilder(
           int index) {
-        return getOpPerformanceFieldBuilder().addBuilder(
+        return internalGetOpPerformanceFieldBuilder().addBuilder(
             index, org.tensorflow.proto.OpPerformanceData.OpPerformance.getDefaultInstance());
       }
       /**
@@ -8741,11 +8740,11 @@ public org.tensorflow.proto.OpPerformanceData.OpPerformance.Builder addOpPerform
        */
       public java.util.List 
            getOpPerformanceBuilderList() {
-        return getOpPerformanceFieldBuilder().getBuilderList();
+        return internalGetOpPerformanceFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.OpPerformanceData.OpPerformance, org.tensorflow.proto.OpPerformanceData.OpPerformance.Builder, org.tensorflow.proto.OpPerformanceData.OpPerformanceOrBuilder> 
-          getOpPerformanceFieldBuilder() {
+          internalGetOpPerformanceFieldBuilder() {
         if (opPerformanceBuilder_ == null) {
           opPerformanceBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.OpPerformanceData.OpPerformance, org.tensorflow.proto.OpPerformanceData.OpPerformance.Builder, org.tensorflow.proto.OpPerformanceData.OpPerformanceOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizedFunctionGraphOuterClass.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizedFunctionGraphOuterClass.java
index 324e2a3431c..5f675abbcae 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizedFunctionGraphOuterClass.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizedFunctionGraphOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/optimized_function_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class OptimizedFunctionGraphOuterClass {
   private OptimizedFunctionGraphOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       OptimizedFunctionGraphOuterClass.class.getName());
   }
@@ -269,8 +270,8 @@ public static final class OptimizedFunctionGraph extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         OptimizedFunctionGraph.class.getName());
     }
@@ -343,8 +344,8 @@ public enum OptimizationSource
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           OptimizationSource.class.getName());
       }
@@ -417,7 +418,7 @@ public OptimizationSource findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGraph.getDescriptor().getEnumTypes().get(0);
       }
@@ -634,8 +635,9 @@ public java.lang.String getNodeNameToControlRetOrThrow(
 
     public static final int RET_TYPES_FIELD_NUMBER = 4;
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList retTypes_;
-    private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
+    private com.google.protobuf.Internal.IntList retTypes_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
         org.tensorflow.proto.DataType> retTypes_converter_ =
             new com.google.protobuf.Internal.IntListAdapter.IntConverter<
                 org.tensorflow.proto.DataType>() {
@@ -1120,7 +1122,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getFunctionGraphFieldBuilder();
+          internalGetFunctionGraphFieldBuilder();
         }
       }
       @java.lang.Override
@@ -1135,7 +1137,6 @@ public Builder clear() {
         }
         internalGetMutableNodeNameToControlRet().clear();
         retTypes_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
         numReturnNodes_ = 0;
         source_ = 0;
         optimizationTimeUsecs_ = 0L;
@@ -1165,20 +1166,11 @@ public org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGr
       @java.lang.Override
       public org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGraph buildPartial() {
         org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGraph result = new org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGraph(this);
-        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGraph result) {
-        if (((bitField0_ & 0x00000008) != 0)) {
-          retTypes_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.retTypes_ = retTypes_;
-      }
-
       private void buildPartial0(org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGraph result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1195,6 +1187,10 @@ private void buildPartial0(org.tensorflow.proto.OptimizedFunctionGraphOuterClass
           result.nodeNameToControlRet_ = internalGetNodeNameToControlRet();
           result.nodeNameToControlRet_.makeImmutable();
         }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          retTypes_.makeImmutable();
+          result.retTypes_ = retTypes_;
+        }
         if (((from_bitField0_ & 0x00000010) != 0)) {
           result.numReturnNodes_ = numReturnNodes_;
         }
@@ -1235,7 +1231,8 @@ public Builder mergeFrom(org.tensorflow.proto.OptimizedFunctionGraphOuterClass.O
         if (!other.retTypes_.isEmpty()) {
           if (retTypes_.isEmpty()) {
             retTypes_ = other.retTypes_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            retTypes_.makeImmutable();
+            bitField0_ |= 0x00000008;
           } else {
             ensureRetTypesIsMutable();
             retTypes_.addAll(other.retTypes_);
@@ -1246,7 +1243,7 @@ public Builder mergeFrom(org.tensorflow.proto.OptimizedFunctionGraphOuterClass.O
           setNumReturnNodes(other.getNumReturnNodes());
         }
         if (other.hasSource()) {
-          setSource(other.getSource());
+          setSourceValue(other.getSourceValue());
         }
         if (other.hasOptimizationTimeUsecs()) {
           setOptimizationTimeUsecs(other.getOptimizationTimeUsecs());
@@ -1284,7 +1281,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getFunctionGraphFieldBuilder().getBuilder(),
+                    internalGetFunctionGraphFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -1306,13 +1303,12 @@ public Builder mergeFrom(
               } // case 32
               case 34: {
                 int length = input.readRawVarint32();
-                int oldLimit = input.pushLimit(length);
-                while(input.getBytesUntilLimit() > 0) {
-                  int tmpRaw = input.readEnum();
-                  ensureRetTypesIsMutable();
-                  retTypes_.addInt(tmpRaw);
+                int limit = input.pushLimit(length);
+                ensureRetTypesIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  retTypes_.addInt(input.readEnum());
                 }
-                input.popLimit(oldLimit);
+                input.popLimit(limit);
                 break;
               } // case 34
               case 40: {
@@ -1563,7 +1559,7 @@ public Builder clearFunctionGraph() {
       public org.tensorflow.proto.GraphDef.Builder getFunctionGraphBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getFunctionGraphFieldBuilder().getBuilder();
+        return internalGetFunctionGraphFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -1589,7 +1585,7 @@ public org.tensorflow.proto.GraphDefOrBuilder getFunctionGraphOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder> 
-          getFunctionGraphFieldBuilder() {
+          internalGetFunctionGraphFieldBuilder() {
         if (functionGraphBuilder_ == null) {
           functionGraphBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder>(
@@ -1763,13 +1759,12 @@ public Builder putAllNodeNameToControlRet(
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList retTypes_ =
-        emptyIntList();
+      private com.google.protobuf.Internal.IntList retTypes_ = emptyIntList();
       private void ensureRetTypesIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!retTypes_.isModifiable()) {
           retTypes_ = makeMutableCopy(retTypes_);
-          bitField0_ |= 0x00000008;
         }
+        bitField0_ |= 0x00000008;
       }
       /**
        * 
@@ -1822,9 +1817,7 @@ public org.tensorflow.proto.DataType getRetTypes(int index) {
        */
       public Builder setRetTypes(
           int index, org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureRetTypesIsMutable();
         retTypes_.setInt(index, value.getNumber());
         onChanged();
@@ -1841,9 +1834,7 @@ public Builder setRetTypes(
        * @return This builder for chaining.
        */
       public Builder addRetTypes(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureRetTypesIsMutable();
         retTypes_.addInt(value.getNumber());
         onChanged();
@@ -1894,7 +1885,8 @@ public Builder clearRetTypes() {
        */
       public java.util.List
       getRetTypesValueList() {
-        return java.util.Collections.unmodifiableList(retTypes_);
+        retTypes_.makeImmutable();
+        return retTypes_;
       }
       /**
        * 
@@ -2068,9 +2060,7 @@ public org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGr
        * @return This builder for chaining.
        */
       public Builder setSource(org.tensorflow.proto.OptimizedFunctionGraphOuterClass.OptimizedFunctionGraph.OptimizationSource value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000020;
         source_ = value.getNumber();
         onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizerOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizerOptions.java
index 3db93f28f92..4d3a2413a58 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizerOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizerOptions.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.OptimizerOptions}
  */
+@com.google.protobuf.Generated
 public final class OptimizerOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.OptimizerOptions)
@@ -21,8 +22,8 @@ public final class OptimizerOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       OptimizerOptions.class.getName());
   }
@@ -83,8 +84,8 @@ public enum Level
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Level.class.getName());
     }
@@ -163,7 +164,7 @@ public Level findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.OptimizerOptions.getDescriptor().getEnumTypes().get(0);
     }
@@ -234,8 +235,8 @@ public enum GlobalJitLevel
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         GlobalJitLevel.class.getName());
     }
@@ -324,7 +325,7 @@ public GlobalJitLevel findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.OptimizerOptions.getDescriptor().getEnumTypes().get(1);
     }
@@ -1179,9 +1180,7 @@ public org.tensorflow.proto.OptimizerOptions.Level getOptLevel() {
      * @return This builder for chaining.
      */
     public Builder setOptLevel(org.tensorflow.proto.OptimizerOptions.Level value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000010;
       optLevel_ = value.getNumber();
       onChanged();
@@ -1237,9 +1236,7 @@ public org.tensorflow.proto.OptimizerOptions.GlobalJitLevel getGlobalJitLevel()
      * @return This builder for chaining.
      */
     public Builder setGlobalJitLevel(org.tensorflow.proto.OptimizerOptions.GlobalJitLevel value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000020;
       globalJitLevel_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizerOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizerOptionsOrBuilder.java
index 0f08f0071ec..fce5d81b94c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizerOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/OptimizerOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface OptimizerOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.OptimizerOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/PlatformInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/PlatformInfo.java
index 1f78bab992e..fcc9121c4c6 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/PlatformInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/PlatformInfo.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.PlatformInfo}
  */
+@com.google.protobuf.Generated
 public final class PlatformInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.PlatformInfo)
@@ -17,8 +18,8 @@ public final class PlatformInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       PlatformInfo.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/PlatformInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/PlatformInfoOrBuilder.java
index 28ee5913d54..4d22b446489 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/PlatformInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/PlatformInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface PlatformInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.PlatformInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ProfilerOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ProfilerOptions.java
index aaf846a8472..89ad80f553b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ProfilerOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ProfilerOptions.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tsl/profiler/protobuf/profiler_options.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ProfilerOptions {
   private ProfilerOptions() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ProfilerOptions.class.getName());
   }
@@ -290,10 +291,52 @@ org.tensorflow.proto.ProfilerOptions.ProfileOptions.AdvancedConfigValue getAdvan
      * @return The raiseErrorOnStartFailure.
      */
     boolean getRaiseErrorOnStartFailure();
+
+    /**
+     * 
+     * Identifier of the profiling session. This will be used as the subdirectory
+     * under the repository path. If not set, the current timestamp will be used.
+     * 

+     *
+     * string session_id = 14;
+     * @return The sessionId.
+     */
+    java.lang.String getSessionId();
+    /**
+     * 
+     * Identifier of the profiling session. This will be used as the subdirectory
+     * under the repository path. If not set, the current timestamp will be used.
+     * 

+     *
+     * string session_id = 14;
+     * @return The bytes for sessionId.
+     */
+    com.google.protobuf.ByteString
+        getSessionIdBytes();
+
+    /**
+     * 
+     * If set, this hostname will be used to name the profile file.
+     * 

+     *
+     * string override_hostname = 15;
+     * @return The overrideHostname.
+     */
+    java.lang.String getOverrideHostname();
+    /**
+     * 
+     * If set, this hostname will be used to name the profile file.
+     * 

+     *
+     * string override_hostname = 15;
+     * @return The bytes for overrideHostname.
+     */
+    com.google.protobuf.ByteString
+        getOverrideHostnameBytes();
   }
   /**
    * 
-   * Next ID: 14
+   * Next ID: 16
    * 

    *
    * Protobuf type {@code tensorflow.ProfileOptions}
@@ -307,8 +350,8 @@ public static final class ProfileOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ProfileOptions.class.getName());
     }
@@ -319,6 +362,8 @@ private ProfileOptions(com.google.protobuf.GeneratedMessage.Builder builder)
     private ProfileOptions() {
       deviceType_ = 0;
       repositoryPath_ = "";
+      sessionId_ = "";
+      overrideHostname_ = "";
     }
 
     public static final com.google.protobuf.Descriptors.Descriptor
@@ -378,8 +423,8 @@ public enum DeviceType
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           DeviceType.class.getName());
       }
@@ -462,7 +507,7 @@ public DeviceType findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.ProfilerOptions.ProfileOptions.getDescriptor().getEnumTypes().get(0);
       }
@@ -519,8 +564,8 @@ public static final class TraceOptions extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           TraceOptions.class.getName());
       }
@@ -1022,8 +1067,8 @@ public static final class AdvancedConfigValue extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           AdvancedConfigValue.class.getName());
       }
@@ -2191,6 +2236,102 @@ public boolean getRaiseErrorOnStartFailure() {
       return raiseErrorOnStartFailure_;
     }
 
+    public static final int SESSION_ID_FIELD_NUMBER = 14;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object sessionId_ = "";
+    /**
+     * 
+     * Identifier of the profiling session. This will be used as the subdirectory
+     * under the repository path. If not set, the current timestamp will be used.
+     * 

+     *
+     * string session_id = 14;
+     * @return The sessionId.
+     */
+    @java.lang.Override
+    public java.lang.String getSessionId() {
+      java.lang.Object ref = sessionId_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        sessionId_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * Identifier of the profiling session. This will be used as the subdirectory
+     * under the repository path. If not set, the current timestamp will be used.
+     * 

+     *
+     * string session_id = 14;
+     * @return The bytes for sessionId.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getSessionIdBytes() {
+      java.lang.Object ref = sessionId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        sessionId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int OVERRIDE_HOSTNAME_FIELD_NUMBER = 15;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object overrideHostname_ = "";
+    /**
+     * 
+     * If set, this hostname will be used to name the profile file.
+     * 

+     *
+     * string override_hostname = 15;
+     * @return The overrideHostname.
+     */
+    @java.lang.Override
+    public java.lang.String getOverrideHostname() {
+      java.lang.Object ref = overrideHostname_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        overrideHostname_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * If set, this hostname will be used to name the profile file.
+     * 

+     *
+     * string override_hostname = 15;
+     * @return The bytes for overrideHostname.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getOverrideHostnameBytes() {
+      java.lang.Object ref = overrideHostname_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        overrideHostname_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -2247,6 +2388,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (raiseErrorOnStartFailure_ != false) {
         output.writeBool(13, raiseErrorOnStartFailure_);
       }
+      if (!com.google.protobuf.GeneratedMessage.isStringEmpty(sessionId_)) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 14, sessionId_);
+      }
+      if (!com.google.protobuf.GeneratedMessage.isStringEmpty(overrideHostname_)) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 15, overrideHostname_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -2313,6 +2460,12 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(13, raiseErrorOnStartFailure_);
       }
+      if (!com.google.protobuf.GeneratedMessage.isStringEmpty(sessionId_)) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(14, sessionId_);
+      }
+      if (!com.google.protobuf.GeneratedMessage.isStringEmpty(overrideHostname_)) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(15, overrideHostname_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -2356,6 +2509,10 @@ public boolean equals(final java.lang.Object obj) {
           other.internalGetAdvancedConfiguration())) return false;
       if (getRaiseErrorOnStartFailure()
           != other.getRaiseErrorOnStartFailure()) return false;
+      if (!getSessionId()
+          .equals(other.getSessionId())) return false;
+      if (!getOverrideHostname()
+          .equals(other.getOverrideHostname())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -2402,6 +2559,10 @@ public int hashCode() {
       hash = (37 * hash) + RAISE_ERROR_ON_START_FAILURE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getRaiseErrorOnStartFailure());
+      hash = (37 * hash) + SESSION_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSessionId().hashCode();
+      hash = (37 * hash) + OVERRIDE_HOSTNAME_FIELD_NUMBER;
+      hash = (53 * hash) + getOverrideHostname().hashCode();
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -2501,7 +2662,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
-     * Next ID: 14
+     * Next ID: 16
      * 

      *
      * Protobuf type {@code tensorflow.ProfileOptions}
@@ -2558,7 +2719,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getTraceOptionsFieldBuilder();
+          internalGetTraceOptionsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -2582,6 +2743,8 @@ public Builder clear() {
         }
         internalGetMutableAdvancedConfiguration().clear();
         raiseErrorOnStartFailure_ = false;
+        sessionId_ = "";
+        overrideHostname_ = "";
         return this;
       }
 
@@ -2658,6 +2821,12 @@ private void buildPartial0(org.tensorflow.proto.ProfilerOptions.ProfileOptions r
         if (((from_bitField0_ & 0x00001000) != 0)) {
           result.raiseErrorOnStartFailure_ = raiseErrorOnStartFailure_;
         }
+        if (((from_bitField0_ & 0x00002000) != 0)) {
+          result.sessionId_ = sessionId_;
+        }
+        if (((from_bitField0_ & 0x00004000) != 0)) {
+          result.overrideHostname_ = overrideHostname_;
+        }
         result.bitField0_ |= to_bitField0_;
       }
 
@@ -2714,6 +2883,16 @@ public Builder mergeFrom(org.tensorflow.proto.ProfilerOptions.ProfileOptions oth
         if (other.getRaiseErrorOnStartFailure() != false) {
           setRaiseErrorOnStartFailure(other.getRaiseErrorOnStartFailure());
         }
+        if (!other.getSessionId().isEmpty()) {
+          sessionId_ = other.sessionId_;
+          bitField0_ |= 0x00002000;
+          onChanged();
+        }
+        if (!other.getOverrideHostname().isEmpty()) {
+          overrideHostname_ = other.overrideHostname_;
+          bitField0_ |= 0x00004000;
+          onChanged();
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -2792,7 +2971,7 @@ public Builder mergeFrom(
               } // case 82
               case 90: {
                 input.readMessage(
-                    getTraceOptionsFieldBuilder().getBuilder(),
+                    internalGetTraceOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000400;
                 break;
@@ -2811,6 +2990,16 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00001000;
                 break;
               } // case 104
+              case 114: {
+                sessionId_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00002000;
+                break;
+              } // case 114
+              case 122: {
+                overrideHostname_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00004000;
+                break;
+              } // case 122
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -2952,9 +3141,7 @@ public org.tensorflow.proto.ProfilerOptions.ProfileOptions.DeviceType getDeviceT
        * @return This builder for chaining.
        */
       public Builder setDeviceType(org.tensorflow.proto.ProfilerOptions.ProfileOptions.DeviceType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000002;
         deviceType_ = value.getNumber();
         onChanged();
@@ -3514,7 +3701,7 @@ public Builder clearTraceOptions() {
       public org.tensorflow.proto.ProfilerOptions.ProfileOptions.TraceOptions.Builder getTraceOptionsBuilder() {
         bitField0_ |= 0x00000400;
         onChanged();
-        return getTraceOptionsFieldBuilder().getBuilder();
+        return internalGetTraceOptionsFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.ProfileOptions.TraceOptions trace_options = 11;
@@ -3532,7 +3719,7 @@ public org.tensorflow.proto.ProfilerOptions.ProfileOptions.TraceOptionsOrBuilder
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.ProfilerOptions.ProfileOptions.TraceOptions, org.tensorflow.proto.ProfilerOptions.ProfileOptions.TraceOptions.Builder, org.tensorflow.proto.ProfilerOptions.ProfileOptions.TraceOptionsOrBuilder> 
-          getTraceOptionsFieldBuilder() {
+          internalGetTraceOptionsFieldBuilder() {
         if (traceOptionsBuilder_ == null) {
           traceOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.ProfilerOptions.ProfileOptions.TraceOptions, org.tensorflow.proto.ProfilerOptions.ProfileOptions.TraceOptions.Builder, org.tensorflow.proto.ProfilerOptions.ProfileOptions.TraceOptionsOrBuilder>(
@@ -3827,6 +4014,195 @@ public Builder clearRaiseErrorOnStartFailure() {
         return this;
       }
 
+      private java.lang.Object sessionId_ = "";
+      /**
+       * 
+       * Identifier of the profiling session. This will be used as the subdirectory
+       * under the repository path. If not set, the current timestamp will be used.
+       * 

+       *
+       * string session_id = 14;
+       * @return The sessionId.
+       */
+      public java.lang.String getSessionId() {
+        java.lang.Object ref = sessionId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          sessionId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * 
+       * Identifier of the profiling session. This will be used as the subdirectory
+       * under the repository path. If not set, the current timestamp will be used.
+       * 

+       *
+       * string session_id = 14;
+       * @return The bytes for sessionId.
+       */
+      public com.google.protobuf.ByteString
+          getSessionIdBytes() {
+        java.lang.Object ref = sessionId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          sessionId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * 
+       * Identifier of the profiling session. This will be used as the subdirectory
+       * under the repository path. If not set, the current timestamp will be used.
+       * 

+       *
+       * string session_id = 14;
+       * @param value The sessionId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSessionId(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        sessionId_ = value;
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * Identifier of the profiling session. This will be used as the subdirectory
+       * under the repository path. If not set, the current timestamp will be used.
+       * 

+       *
+       * string session_id = 14;
+       * @return This builder for chaining.
+       */
+      public Builder clearSessionId() {
+        sessionId_ = getDefaultInstance().getSessionId();
+        bitField0_ = (bitField0_ & ~0x00002000);
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * Identifier of the profiling session. This will be used as the subdirectory
+       * under the repository path. If not set, the current timestamp will be used.
+       * 

+       *
+       * string session_id = 14;
+       * @param value The bytes for sessionId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSessionIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        checkByteStringIsUtf8(value);
+        sessionId_ = value;
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object overrideHostname_ = "";
+      /**
+       * 
+       * If set, this hostname will be used to name the profile file.
+       * 

+       *
+       * string override_hostname = 15;
+       * @return The overrideHostname.
+       */
+      public java.lang.String getOverrideHostname() {
+        java.lang.Object ref = overrideHostname_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          overrideHostname_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * 
+       * If set, this hostname will be used to name the profile file.
+       * 

+       *
+       * string override_hostname = 15;
+       * @return The bytes for overrideHostname.
+       */
+      public com.google.protobuf.ByteString
+          getOverrideHostnameBytes() {
+        java.lang.Object ref = overrideHostname_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          overrideHostname_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * 
+       * If set, this hostname will be used to name the profile file.
+       * 

+       *
+       * string override_hostname = 15;
+       * @param value The overrideHostname to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOverrideHostname(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        overrideHostname_ = value;
+        bitField0_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * If set, this hostname will be used to name the profile file.
+       * 

+       *
+       * string override_hostname = 15;
+       * @return This builder for chaining.
+       */
+      public Builder clearOverrideHostname() {
+        overrideHostname_ = getDefaultInstance().getOverrideHostname();
+        bitField0_ = (bitField0_ & ~0x00004000);
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * If set, this hostname will be used to name the profile file.
+       * 

+       *
+       * string override_hostname = 15;
+       * @param value The bytes for overrideHostname to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOverrideHostnameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        checkByteStringIsUtf8(value);
+        overrideHostname_ = value;
+        bitField0_ |= 0x00004000;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:tensorflow.ProfileOptions)
     }
 
@@ -4000,8 +4376,8 @@ public static final class RemoteProfilerSessionManagerOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         RemoteProfilerSessionManagerOptions.class.getName());
     }
@@ -4420,7 +4796,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getProfilerOptionsFieldBuilder();
+          internalGetProfilerOptionsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -4555,7 +4931,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getProfilerOptionsFieldBuilder().getBuilder(),
+                    internalGetProfilerOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -4717,7 +5093,7 @@ public Builder clearProfilerOptions() {
       public org.tensorflow.proto.ProfilerOptions.ProfileOptions.Builder getProfilerOptionsBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getProfilerOptionsFieldBuilder().getBuilder();
+        return internalGetProfilerOptionsFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -4743,7 +5119,7 @@ public org.tensorflow.proto.ProfilerOptions.ProfileOptionsOrBuilder getProfilerO
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.ProfilerOptions.ProfileOptions, org.tensorflow.proto.ProfilerOptions.ProfileOptions.Builder, org.tensorflow.proto.ProfilerOptions.ProfileOptionsOrBuilder> 
-          getProfilerOptionsFieldBuilder() {
+          internalGetProfilerOptionsFieldBuilder() {
         if (profilerOptionsBuilder_ == null) {
           profilerOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.ProfilerOptions.ProfileOptions, org.tensorflow.proto.ProfilerOptions.ProfileOptions.Builder, org.tensorflow.proto.ProfilerOptions.ProfileOptionsOrBuilder>(
@@ -5129,7 +5505,7 @@ public org.tensorflow.proto.ProfilerOptions.RemoteProfilerSessionManagerOptions
   static {
     java.lang.String[] descriptorData = {
       "\n,tsl/profiler/protobuf/profiler_options" +
-      ".proto\022\ntensorflow\"\305\006\n\016ProfileOptions\022\017\n" +
+      ".proto\022\ntensorflow\"\364\006\n\016ProfileOptions\022\017\n" +
       "\007version\030\005 \001(\r\022:\n\013device_type\030\006 \001(\0162%.te" +
       "nsorflow.ProfileOptions.DeviceType\022\033\n\023in" +
       "clude_dataset_ops\030\001 \001(\010\022\031\n\021host_tracer_l" +
@@ -5141,22 +5517,23 @@ public org.tensorflow.proto.ProfilerOptions.RemoteProfilerSessionManagerOptions
       "flow.ProfileOptions.TraceOptions\022U\n\026adva" +
       "nced_configuration\030\014 \003(\01325.tensorflow.Pr" +
       "ofileOptions.AdvancedConfigurationEntry\022" +
-      "$\n\034raise_error_on_start_failure\030\r \001(\010\0320\n" +
-      "\014TraceOptions\022 \n\030host_traceme_filter_mas" +
-      "k\030\001 \001(\004\032c\n\023AdvancedConfigValue\022\026\n\014string" +
-      "_value\030\001 \001(\tH\000\022\024\n\nbool_value\030\002 \001(\010H\000\022\025\n\013" +
-      "int64_value\030\003 \001(\003H\000B\007\n\005value\032l\n\032Advanced" +
-      "ConfigurationEntry\022\013\n\003key\030\001 \001(\t\022=\n\005value" +
-      "\030\002 \001(\0132..tensorflow.ProfileOptions.Advan" +
-      "cedConfigValue:\0028\001\"N\n\nDeviceType\022\017\n\013UNSP" +
-      "ECIFIED\020\000\022\007\n\003CPU\020\001\022\007\n\003GPU\020\002\022\007\n\003TPU\020\003\022\024\n\020" +
-      "PLUGGABLE_DEVICE\020\004\"\320\001\n#RemoteProfilerSes" +
-      "sionManagerOptions\0224\n\020profiler_options\030\001" +
-      " \001(\0132\032.tensorflow.ProfileOptions\022\031\n\021serv" +
-      "ice_addresses\030\002 \003(\t\022%\n\035session_creation_" +
-      "timestamp_ns\030\003 \001(\004\022\037\n\027max_session_durati" +
-      "on_ms\030\004 \001(\004\022\020\n\010delay_ms\030\005 \001(\004B\026\n\024org.ten" +
-      "sorflow.protob\006proto3"
+      "$\n\034raise_error_on_start_failure\030\r \001(\010\022\022\n" +
+      "\nsession_id\030\016 \001(\t\022\031\n\021override_hostname\030\017" +
+      " \001(\t\0320\n\014TraceOptions\022 \n\030host_traceme_fil" +
+      "ter_mask\030\001 \001(\004\032c\n\023AdvancedConfigValue\022\026\n" +
+      "\014string_value\030\001 \001(\tH\000\022\024\n\nbool_value\030\002 \001(" +
+      "\010H\000\022\025\n\013int64_value\030\003 \001(\003H\000B\007\n\005value\032l\n\032A" +
+      "dvancedConfigurationEntry\022\013\n\003key\030\001 \001(\t\022=" +
+      "\n\005value\030\002 \001(\0132..tensorflow.ProfileOption" +
+      "s.AdvancedConfigValue:\0028\001\"N\n\nDeviceType\022" +
+      "\017\n\013UNSPECIFIED\020\000\022\007\n\003CPU\020\001\022\007\n\003GPU\020\002\022\007\n\003TP" +
+      "U\020\003\022\024\n\020PLUGGABLE_DEVICE\020\004\"\320\001\n#RemoteProf" +
+      "ilerSessionManagerOptions\0224\n\020profiler_op" +
+      "tions\030\001 \001(\0132\032.tensorflow.ProfileOptions\022" +
+      "\031\n\021service_addresses\030\002 \003(\t\022%\n\035session_cr" +
+      "eation_timestamp_ns\030\003 \001(\004\022\037\n\027max_session" +
+      "_duration_ms\030\004 \001(\004\022\020\n\010delay_ms\030\005 \001(\004B\026\n\024" +
+      "org.tensorflow.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -5167,7 +5544,7 @@ public org.tensorflow.proto.ProfilerOptions.RemoteProfilerSessionManagerOptions
     internal_static_tensorflow_ProfileOptions_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_tensorflow_ProfileOptions_descriptor,
-        new java.lang.String[] { "Version", "DeviceType", "IncludeDatasetOps", "HostTracerLevel", "DeviceTracerLevel", "PythonTracerLevel", "EnableHloProto", "StartTimestampNs", "DurationMs", "RepositoryPath", "TraceOptions", "AdvancedConfiguration", "RaiseErrorOnStartFailure", });
+        new java.lang.String[] { "Version", "DeviceType", "IncludeDatasetOps", "HostTracerLevel", "DeviceTracerLevel", "PythonTracerLevel", "EnableHloProto", "StartTimestampNs", "DurationMs", "RepositoryPath", "TraceOptions", "AdvancedConfiguration", "RaiseErrorOnStartFailure", "SessionId", "OverrideHostname", });
     internal_static_tensorflow_ProfileOptions_TraceOptions_descriptor =
       internal_static_tensorflow_ProfileOptions_descriptor.getNestedTypes().get(0);
     internal_static_tensorflow_ProfileOptions_TraceOptions_fieldAccessorTable = new
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerDef.java
index 550c1c55a0b..ac9c8a22959 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/queue_runner.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.QueueRunnerDef}
  */
+@com.google.protobuf.Generated
 public final class QueueRunnerDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.QueueRunnerDef)
@@ -21,8 +22,8 @@ public final class QueueRunnerDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       QueueRunnerDef.class.getName());
   }
@@ -248,8 +249,9 @@ public java.lang.String getCancelOpName() {
 
   public static final int QUEUE_CLOSED_EXCEPTION_TYPES_FIELD_NUMBER = 5;
   @SuppressWarnings("serial")
-  private com.google.protobuf.Internal.IntList queueClosedExceptionTypes_;
-  private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
+  private com.google.protobuf.Internal.IntList queueClosedExceptionTypes_ =
+      emptyIntList();
+  private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
       org.tensorflow.proto.error.Code> queueClosedExceptionTypes_converter_ =
           new com.google.protobuf.Internal.IntListAdapter.IntConverter<
               org.tensorflow.proto.error.Code>() {
@@ -591,7 +593,6 @@ public Builder clear() {
       closeOpName_ = "";
       cancelOpName_ = "";
       queueClosedExceptionTypes_ = emptyIntList();
-      bitField0_ = (bitField0_ & ~0x00000010);
       return this;
     }
 
@@ -618,20 +619,11 @@ public org.tensorflow.proto.QueueRunnerDef build() {
     @java.lang.Override
     public org.tensorflow.proto.QueueRunnerDef buildPartial() {
       org.tensorflow.proto.QueueRunnerDef result = new org.tensorflow.proto.QueueRunnerDef(this);
-      buildPartialRepeatedFields(result);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartialRepeatedFields(org.tensorflow.proto.QueueRunnerDef result) {
-      if (((bitField0_ & 0x00000010) != 0)) {
-        queueClosedExceptionTypes_.makeImmutable();
-        bitField0_ = (bitField0_ & ~0x00000010);
-      }
-      result.queueClosedExceptionTypes_ = queueClosedExceptionTypes_;
-    }
-
     private void buildPartial0(org.tensorflow.proto.QueueRunnerDef result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -647,6 +639,10 @@ private void buildPartial0(org.tensorflow.proto.QueueRunnerDef result) {
       if (((from_bitField0_ & 0x00000008) != 0)) {
         result.cancelOpName_ = cancelOpName_;
       }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        queueClosedExceptionTypes_.makeImmutable();
+        result.queueClosedExceptionTypes_ = queueClosedExceptionTypes_;
+      }
     }
 
     @java.lang.Override
@@ -689,7 +685,8 @@ public Builder mergeFrom(org.tensorflow.proto.QueueRunnerDef other) {
       if (!other.queueClosedExceptionTypes_.isEmpty()) {
         if (queueClosedExceptionTypes_.isEmpty()) {
           queueClosedExceptionTypes_ = other.queueClosedExceptionTypes_;
-          bitField0_ = (bitField0_ & ~0x00000010);
+          queueClosedExceptionTypes_.makeImmutable();
+          bitField0_ |= 0x00000010;
         } else {
           ensureQueueClosedExceptionTypesIsMutable();
           queueClosedExceptionTypes_.addAll(other.queueClosedExceptionTypes_);
@@ -751,13 +748,12 @@ public Builder mergeFrom(
             } // case 40
             case 42: {
               int length = input.readRawVarint32();
-              int oldLimit = input.pushLimit(length);
-              while(input.getBytesUntilLimit() > 0) {
-                int tmpRaw = input.readEnum();
-                ensureQueueClosedExceptionTypesIsMutable();
-                queueClosedExceptionTypes_.addInt(tmpRaw);
+              int limit = input.pushLimit(length);
+              ensureQueueClosedExceptionTypesIsMutable();
+              while (input.getBytesUntilLimit() > 0) {
+                queueClosedExceptionTypes_.addInt(input.readEnum());
               }
-              input.popLimit(oldLimit);
+              input.popLimit(limit);
               break;
             } // case 42
             default: {
@@ -1200,13 +1196,12 @@ public Builder setCancelOpNameBytes(
       return this;
     }
 
-    private com.google.protobuf.Internal.IntList queueClosedExceptionTypes_ =
-      emptyIntList();
+    private com.google.protobuf.Internal.IntList queueClosedExceptionTypes_ = emptyIntList();
     private void ensureQueueClosedExceptionTypesIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!queueClosedExceptionTypes_.isModifiable()) {
         queueClosedExceptionTypes_ = makeMutableCopy(queueClosedExceptionTypes_);
-        bitField0_ |= 0x00000010;
       }
+      bitField0_ |= 0x00000010;
     }
     /**
      * 
@@ -1259,9 +1254,7 @@ public org.tensorflow.proto.error.Code getQueueClosedExceptionTypes(int index) {
      */
     public Builder setQueueClosedExceptionTypes(
         int index, org.tensorflow.proto.error.Code value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       ensureQueueClosedExceptionTypesIsMutable();
       queueClosedExceptionTypes_.setInt(index, value.getNumber());
       onChanged();
@@ -1278,9 +1271,7 @@ public Builder setQueueClosedExceptionTypes(
      * @return This builder for chaining.
      */
     public Builder addQueueClosedExceptionTypes(org.tensorflow.proto.error.Code value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       ensureQueueClosedExceptionTypesIsMutable();
       queueClosedExceptionTypes_.addInt(value.getNumber());
       onChanged();
@@ -1331,7 +1322,8 @@ public Builder clearQueueClosedExceptionTypes() {
      */
     public java.util.List
     getQueueClosedExceptionTypesValueList() {
-      return java.util.Collections.unmodifiableList(queueClosedExceptionTypes_);
+      queueClosedExceptionTypes_.makeImmutable();
+      return queueClosedExceptionTypes_;
     }
     /**
      * 
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerDefOrBuilder.java
index c4f232bf15d..b58a49f65aa 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/queue_runner.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface QueueRunnerDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.QueueRunnerDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerProtos.java
index 23c75114991..ae3907806be 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/QueueRunnerProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/queue_runner.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class QueueRunnerProtos {
   private QueueRunnerProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       QueueRunnerProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseProtos.java
index 07c85d130a3..d318baa070c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/reader_base.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ReaderBaseProtos {
   private ReaderBaseProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ReaderBaseProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseState.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseState.java
index 4e619b9297c..09f993cd493 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseState.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseState.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/reader_base.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.ReaderBaseState}
  */
+@com.google.protobuf.Generated
 public final class ReaderBaseState extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ReaderBaseState)
@@ -22,8 +23,8 @@ public final class ReaderBaseState extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ReaderBaseState.class.getName());
   }
@@ -396,7 +397,7 @@ public Builder mergeFrom(org.tensorflow.proto.ReaderBaseState other) {
       if (other.getNumRecordsProduced() != 0L) {
         setNumRecordsProduced(other.getNumRecordsProduced());
       }
-      if (other.getCurrentWork() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getCurrentWork().isEmpty()) {
         setCurrentWork(other.getCurrentWork());
       }
       this.mergeUnknownFields(other.getUnknownFields());
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseStateOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseStateOrBuilder.java
index e6b3261fb44..b597b1b081d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseStateOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ReaderBaseStateOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/reader_base.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ReaderBaseStateOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ReaderBaseState)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RegisteredGradient.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RegisteredGradient.java
index 9131e5c26b6..a2f1e445f48 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RegisteredGradient.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RegisteredGradient.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -15,6 +15,7 @@
  *
  * Protobuf type {@code tensorflow.RegisteredGradient}
  */
+@com.google.protobuf.Generated
 public final class RegisteredGradient extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.RegisteredGradient)
@@ -24,8 +25,8 @@ public final class RegisteredGradient extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RegisteredGradient.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RegisteredGradientOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RegisteredGradientOrBuilder.java
index 4ea34c7f055..23d1daa67c3 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RegisteredGradientOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RegisteredGradientOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/function.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface RegisteredGradientOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.RegisteredGradient)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RequestedExitCode.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RequestedExitCode.java
index f092bc9bf5a..1379877e05f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RequestedExitCode.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RequestedExitCode.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.RequestedExitCode}
  */
+@com.google.protobuf.Generated
 public final class RequestedExitCode extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.RequestedExitCode)
@@ -17,8 +18,8 @@ public final class RequestedExitCode extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RequestedExitCode.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RequestedExitCodeOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RequestedExitCodeOrBuilder.java
index 787bd99ff65..d67e09fdbed 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RequestedExitCodeOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RequestedExitCodeOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface RequestedExitCodeOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.RequestedExitCode)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandle.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandle.java
index e9469d731c9..bf9fae0049e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandle.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandle.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/resource_handle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ResourceHandle {
   private ResourceHandle() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ResourceHandle.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandleProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandleProto.java
index db1b56da824..3a36d30ad4e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandleProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandleProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/resource_handle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -14,6 +14,7 @@
  *
  * Protobuf type {@code tensorflow.ResourceHandleProto}
  */
+@com.google.protobuf.Generated
 public final class ResourceHandleProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ResourceHandleProto)
@@ -23,8 +24,8 @@ public final class ResourceHandleProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ResourceHandleProto.class.getName());
   }
@@ -119,8 +120,8 @@ public static final class DtypeAndShape extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DtypeAndShape.class.getName());
     }
@@ -419,7 +420,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getShapeFieldBuilder();
+          internalGetShapeFieldBuilder();
         }
       }
       @java.lang.Override
@@ -529,7 +530,7 @@ public Builder mergeFrom(
               } // case 8
               case 18: {
                 input.readMessage(
-                    getShapeFieldBuilder().getBuilder(),
+                    internalGetShapeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -601,9 +602,7 @@ public org.tensorflow.proto.DataType getDtype() {
        * @return This builder for chaining.
        */
       public Builder setDtype(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         dtype_ = value.getNumber();
         onChanged();
@@ -743,7 +742,7 @@ public Builder clearShape() {
       public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getShapeFieldBuilder().getBuilder();
+        return internalGetShapeFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -769,7 +768,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getShapeFieldBuilder() {
+          internalGetShapeFieldBuilder() {
         if (shapeBuilder_ == null) {
           shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -1480,7 +1479,7 @@ public Builder mergeFrom(org.tensorflow.proto.ResourceHandleProto other) {
             bitField0_ = (bitField0_ & ~0x00000020);
             dtypesAndShapesBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getDtypesAndShapesFieldBuilder() : null;
+                 internalGetDtypesAndShapesFieldBuilder() : null;
           } else {
             dtypesAndShapesBuilder_.addAllMessages(other.dtypesAndShapes_);
           }
@@ -2219,7 +2218,7 @@ public Builder removeDtypesAndShapes(int index) {
      */
     public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder getDtypesAndShapesBuilder(
         int index) {
-      return getDtypesAndShapesFieldBuilder().getBuilder(index);
+      return internalGetDtypesAndShapesFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -2258,7 +2257,7 @@ public org.tensorflow.proto.ResourceHandleProto.DtypeAndShapeOrBuilder getDtypes
      * repeated .tensorflow.ResourceHandleProto.DtypeAndShape dtypes_and_shapes = 6;
      */
     public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder addDtypesAndShapesBuilder() {
-      return getDtypesAndShapesFieldBuilder().addBuilder(
+      return internalGetDtypesAndShapesFieldBuilder().addBuilder(
           org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.getDefaultInstance());
     }
     /**
@@ -2270,7 +2269,7 @@ public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder addDtypesA
      */
     public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder addDtypesAndShapesBuilder(
         int index) {
-      return getDtypesAndShapesFieldBuilder().addBuilder(
+      return internalGetDtypesAndShapesFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.getDefaultInstance());
     }
     /**
@@ -2282,11 +2281,11 @@ public org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder addDtypesA
      */
     public java.util.List 
          getDtypesAndShapesBuilderList() {
-      return getDtypesAndShapesFieldBuilder().getBuilderList();
+      return internalGetDtypesAndShapesFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ResourceHandleProto.DtypeAndShape, org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder, org.tensorflow.proto.ResourceHandleProto.DtypeAndShapeOrBuilder> 
-        getDtypesAndShapesFieldBuilder() {
+        internalGetDtypesAndShapesFieldBuilder() {
       if (dtypesAndShapesBuilder_ == null) {
         dtypesAndShapesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ResourceHandleProto.DtypeAndShape, org.tensorflow.proto.ResourceHandleProto.DtypeAndShape.Builder, org.tensorflow.proto.ResourceHandleProto.DtypeAndShapeOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandleProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandleProtoOrBuilder.java
index 3add868cb14..993258a370a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandleProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ResourceHandleProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/resource_handle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ResourceHandleProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ResourceHandleProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfig.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfig.java
index f5a2645ffb1..b6491bc0edd 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfig.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfig.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/rewriter_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.RewriterConfig}
  */
+@com.google.protobuf.Generated
 public final class RewriterConfig extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.RewriterConfig)
@@ -22,8 +23,8 @@ public final class RewriterConfig extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RewriterConfig.class.getName());
   }
@@ -126,8 +127,8 @@ public enum Toggle
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Toggle.class.getName());
     }
@@ -232,7 +233,7 @@ public Toggle findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.RewriterConfig.getDescriptor().getEnumTypes().get(0);
     }
@@ -288,8 +289,8 @@ public enum CpuLayout
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CpuLayout.class.getName());
     }
@@ -362,7 +363,7 @@ public CpuLayout findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.RewriterConfig.getDescriptor().getEnumTypes().get(1);
     }
@@ -419,8 +420,8 @@ public enum NumIterationsType
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NumIterationsType.class.getName());
     }
@@ -493,7 +494,7 @@ public NumIterationsType findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.RewriterConfig.getDescriptor().getEnumTypes().get(2);
     }
@@ -592,8 +593,8 @@ public enum MemOptType
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MemOptType.class.getName());
     }
@@ -717,7 +718,7 @@ public MemOptType findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.RewriterConfig.getDescriptor().getEnumTypes().get(3);
     }
@@ -811,8 +812,8 @@ public static final class CustomGraphOptimizer extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CustomGraphOptimizer.class.getName());
     }
@@ -3331,11 +3332,11 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getAutoParallelFieldBuilder();
-        getScopedAllocatorOptsFieldBuilder();
-        getCustomOptimizersFieldBuilder();
-        getInterOptimizerVerifierConfigFieldBuilder();
-        getPostOptimizationVerifierConfigFieldBuilder();
+        internalGetAutoParallelFieldBuilder();
+        internalGetScopedAllocatorOptsFieldBuilder();
+        internalGetCustomOptimizersFieldBuilder();
+        internalGetInterOptimizerVerifierConfigFieldBuilder();
+        internalGetPostOptimizationVerifierConfigFieldBuilder();
       }
     }
     @java.lang.Override
@@ -3724,7 +3725,7 @@ public Builder mergeFrom(org.tensorflow.proto.RewriterConfig other) {
             bitField1_ = (bitField1_ & ~0x00000004);
             customOptimizersBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getCustomOptimizersFieldBuilder() : null;
+                 internalGetCustomOptimizersFieldBuilder() : null;
           } else {
             customOptimizersBuilder_.addAllMessages(other.customOptimizers_);
           }
@@ -3784,7 +3785,7 @@ public Builder mergeFrom(
             } // case 32
             case 42: {
               input.readMessage(
-                  getAutoParallelFieldBuilder().getBuilder(),
+                  internalGetAutoParallelFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x40000000;
               break;
@@ -3841,7 +3842,7 @@ public Builder mergeFrom(
             } // case 120
             case 130: {
               input.readMessage(
-                  getScopedAllocatorOptsFieldBuilder().getBuilder(),
+                  internalGetScopedAllocatorOptsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField1_ |= 0x00000001;
               break;
@@ -3952,14 +3953,14 @@ public Builder mergeFrom(
             } // case 1602
             case 2402: {
               input.readMessage(
-                  getInterOptimizerVerifierConfigFieldBuilder().getBuilder(),
+                  internalGetInterOptimizerVerifierConfigFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField1_ |= 0x00000008;
               break;
             } // case 2402
             case 2410: {
               input.readMessage(
-                  getPostOptimizationVerifierConfigFieldBuilder().getBuilder(),
+                  internalGetPostOptimizationVerifierConfigFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField1_ |= 0x00000010;
               break;
@@ -4032,9 +4033,7 @@ public org.tensorflow.proto.RewriterConfig.CpuLayout getCpuLayoutConversion() {
      * @return This builder for chaining.
      */
     public Builder setCpuLayoutConversion(org.tensorflow.proto.RewriterConfig.CpuLayout value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       cpuLayoutConversion_ = value.getNumber();
       onChanged();
@@ -4109,9 +4108,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getLayoutOptimizer() {
      * @return This builder for chaining.
      */
     public Builder setLayoutOptimizer(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000002;
       layoutOptimizer_ = value.getNumber();
       onChanged();
@@ -4191,9 +4188,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getConstantFolding() {
      * @return This builder for chaining.
      */
     public Builder setConstantFolding(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000004;
       constantFolding_ = value.getNumber();
       onChanged();
@@ -4270,9 +4265,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getShapeOptimization() {
      * @return This builder for chaining.
      */
     public Builder setShapeOptimization(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000008;
       shapeOptimization_ = value.getNumber();
       onChanged();
@@ -4348,9 +4341,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getRemapping() {
      * @return This builder for chaining.
      */
     public Builder setRemapping(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000010;
       remapping_ = value.getNumber();
       onChanged();
@@ -4426,9 +4417,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getCommonSubgraphElimination()
      * @return This builder for chaining.
      */
     public Builder setCommonSubgraphElimination(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000020;
       commonSubgraphElimination_ = value.getNumber();
       onChanged();
@@ -4504,9 +4493,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getArithmeticOptimization() {
      * @return This builder for chaining.
      */
     public Builder setArithmeticOptimization(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000040;
       arithmeticOptimization_ = value.getNumber();
       onChanged();
@@ -4582,9 +4569,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getDependencyOptimization() {
      * @return This builder for chaining.
      */
     public Builder setDependencyOptimization(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000080;
       dependencyOptimization_ = value.getNumber();
       onChanged();
@@ -4656,9 +4641,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getLoopOptimization() {
      * @return This builder for chaining.
      */
     public Builder setLoopOptimization(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000100;
       loopOptimization_ = value.getNumber();
       onChanged();
@@ -4729,9 +4712,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getFunctionOptimization() {
      * @return This builder for chaining.
      */
     public Builder setFunctionOptimization(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000200;
       functionOptimization_ = value.getNumber();
       onChanged();
@@ -4802,9 +4783,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getDebugStripper() {
      * @return This builder for chaining.
      */
     public Builder setDebugStripper(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000400;
       debugStripper_ = value.getNumber();
       onChanged();
@@ -4923,9 +4902,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getScopedAllocatorOptimization
      * @return This builder for chaining.
      */
     public Builder setScopedAllocatorOptimization(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00001000;
       scopedAllocatorOptimization_ = value.getNumber();
       onChanged();
@@ -4997,9 +4974,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getPinToHostOptimization() {
      * @return This builder for chaining.
      */
     public Builder setPinToHostOptimization(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00002000;
       pinToHostOptimization_ = value.getNumber();
       onChanged();
@@ -5074,9 +5049,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getImplementationSelector() {
      * @return This builder for chaining.
      */
     public Builder setImplementationSelector(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00004000;
       implementationSelector_ = value.getNumber();
       onChanged();
@@ -5160,9 +5133,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getAutoMixedPrecision() {
      * @return This builder for chaining.
      */
     public Builder setAutoMixedPrecision(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00008000;
       autoMixedPrecision_ = value.getNumber();
       onChanged();
@@ -5252,9 +5223,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getAutoMixedPrecisionMkl() {
      * @return This builder for chaining.
      */
     public Builder setAutoMixedPrecisionMkl(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00010000;
       autoMixedPrecisionMkl_ = value.getNumber();
       onChanged();
@@ -5341,9 +5310,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getAutoMixedPrecisionOnednnBfl
      * @return This builder for chaining.
      */
     public Builder setAutoMixedPrecisionOnednnBfloat16(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00020000;
       autoMixedPrecisionOnednnBfloat16_ = value.getNumber();
       onChanged();
@@ -5433,9 +5400,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getAutoMixedPrecisionCpu() {
      * @return This builder for chaining.
      */
     public Builder setAutoMixedPrecisionCpu(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00040000;
       autoMixedPrecisionCpu_ = value.getNumber();
       onChanged();
@@ -5598,9 +5563,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getUsePluginOptimizers() {
      * @return This builder for chaining.
      */
     public Builder setUsePluginOptimizers(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00200000;
       usePluginOptimizers_ = value.getNumber();
       onChanged();
@@ -5671,9 +5634,7 @@ public org.tensorflow.proto.RewriterConfig.Toggle getExperimentalConditionalCode
      * @return This builder for chaining.
      */
     public Builder setExperimentalConditionalCodeMotion(org.tensorflow.proto.RewriterConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00400000;
       experimentalConditionalCodeMotion_ = value.getNumber();
       onChanged();
@@ -5748,9 +5709,7 @@ public org.tensorflow.proto.RewriterConfig.NumIterationsType getMetaOptimizerIte
      * @return This builder for chaining.
      */
     public Builder setMetaOptimizerIterations(org.tensorflow.proto.RewriterConfig.NumIterationsType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00800000;
       metaOptimizerIterations_ = value.getNumber();
       onChanged();
@@ -5989,9 +5948,7 @@ public org.tensorflow.proto.RewriterConfig.MemOptType getMemoryOptimization() {
      * @return This builder for chaining.
      */
     public Builder setMemoryOptimization(org.tensorflow.proto.RewriterConfig.MemOptType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x08000000;
       memoryOptimization_ = value.getNumber();
       onChanged();
@@ -6317,7 +6274,7 @@ public Builder clearAutoParallel() {
     public org.tensorflow.proto.AutoParallelOptions.Builder getAutoParallelBuilder() {
       bitField0_ |= 0x40000000;
       onChanged();
-      return getAutoParallelFieldBuilder().getBuilder();
+      return internalGetAutoParallelFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -6345,7 +6302,7 @@ public org.tensorflow.proto.AutoParallelOptionsOrBuilder getAutoParallelOrBuilde
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.AutoParallelOptions, org.tensorflow.proto.AutoParallelOptions.Builder, org.tensorflow.proto.AutoParallelOptionsOrBuilder> 
-        getAutoParallelFieldBuilder() {
+        internalGetAutoParallelFieldBuilder() {
       if (autoParallelBuilder_ == null) {
         autoParallelBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.AutoParallelOptions, org.tensorflow.proto.AutoParallelOptions.Builder, org.tensorflow.proto.AutoParallelOptionsOrBuilder>(
@@ -6498,7 +6455,7 @@ public Builder clearScopedAllocatorOpts() {
     public org.tensorflow.proto.ScopedAllocatorOptions.Builder getScopedAllocatorOptsBuilder() {
       bitField1_ |= 0x00000001;
       onChanged();
-      return getScopedAllocatorOptsFieldBuilder().getBuilder();
+      return internalGetScopedAllocatorOptsFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.ScopedAllocatorOptions scoped_allocator_opts = 16;
@@ -6516,7 +6473,7 @@ public org.tensorflow.proto.ScopedAllocatorOptionsOrBuilder getScopedAllocatorOp
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.ScopedAllocatorOptions, org.tensorflow.proto.ScopedAllocatorOptions.Builder, org.tensorflow.proto.ScopedAllocatorOptionsOrBuilder> 
-        getScopedAllocatorOptsFieldBuilder() {
+        internalGetScopedAllocatorOptsFieldBuilder() {
       if (scopedAllocatorOptsBuilder_ == null) {
         scopedAllocatorOptsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.ScopedAllocatorOptions, org.tensorflow.proto.ScopedAllocatorOptions.Builder, org.tensorflow.proto.ScopedAllocatorOptionsOrBuilder>(
@@ -7006,7 +6963,7 @@ public Builder removeCustomOptimizers(int index) {
      */
     public org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.Builder getCustomOptimizersBuilder(
         int index) {
-      return getCustomOptimizersFieldBuilder().getBuilder(index);
+      return internalGetCustomOptimizersFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -7045,7 +7002,7 @@ public org.tensorflow.proto.RewriterConfig.CustomGraphOptimizerOrBuilder getCust
      * repeated .tensorflow.RewriterConfig.CustomGraphOptimizer custom_optimizers = 200;
      */
     public org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.Builder addCustomOptimizersBuilder() {
-      return getCustomOptimizersFieldBuilder().addBuilder(
+      return internalGetCustomOptimizersFieldBuilder().addBuilder(
           org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.getDefaultInstance());
     }
     /**
@@ -7057,7 +7014,7 @@ public org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.Builder addCusto
      */
     public org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.Builder addCustomOptimizersBuilder(
         int index) {
-      return getCustomOptimizersFieldBuilder().addBuilder(
+      return internalGetCustomOptimizersFieldBuilder().addBuilder(
           index, org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.getDefaultInstance());
     }
     /**
@@ -7069,11 +7026,11 @@ public org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.Builder addCusto
      */
     public java.util.List 
          getCustomOptimizersBuilderList() {
-      return getCustomOptimizersFieldBuilder().getBuilderList();
+      return internalGetCustomOptimizersFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer, org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.Builder, org.tensorflow.proto.RewriterConfig.CustomGraphOptimizerOrBuilder> 
-        getCustomOptimizersFieldBuilder() {
+        internalGetCustomOptimizersFieldBuilder() {
       if (customOptimizersBuilder_ == null) {
         customOptimizersBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer, org.tensorflow.proto.RewriterConfig.CustomGraphOptimizer.Builder, org.tensorflow.proto.RewriterConfig.CustomGraphOptimizerOrBuilder>(
@@ -7205,7 +7162,7 @@ public Builder clearInterOptimizerVerifierConfig() {
     public org.tensorflow.proto.VerifierConfig.Builder getInterOptimizerVerifierConfigBuilder() {
       bitField1_ |= 0x00000008;
       onChanged();
-      return getInterOptimizerVerifierConfigFieldBuilder().getBuilder();
+      return internalGetInterOptimizerVerifierConfigFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -7231,7 +7188,7 @@ public org.tensorflow.proto.VerifierConfigOrBuilder getInterOptimizerVerifierCon
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.VerifierConfig, org.tensorflow.proto.VerifierConfig.Builder, org.tensorflow.proto.VerifierConfigOrBuilder> 
-        getInterOptimizerVerifierConfigFieldBuilder() {
+        internalGetInterOptimizerVerifierConfigFieldBuilder() {
       if (interOptimizerVerifierConfigBuilder_ == null) {
         interOptimizerVerifierConfigBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.VerifierConfig, org.tensorflow.proto.VerifierConfig.Builder, org.tensorflow.proto.VerifierConfigOrBuilder>(
@@ -7369,7 +7326,7 @@ public Builder clearPostOptimizationVerifierConfig() {
     public org.tensorflow.proto.VerifierConfig.Builder getPostOptimizationVerifierConfigBuilder() {
       bitField1_ |= 0x00000010;
       onChanged();
-      return getPostOptimizationVerifierConfigFieldBuilder().getBuilder();
+      return internalGetPostOptimizationVerifierConfigFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -7397,7 +7354,7 @@ public org.tensorflow.proto.VerifierConfigOrBuilder getPostOptimizationVerifierC
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.VerifierConfig, org.tensorflow.proto.VerifierConfig.Builder, org.tensorflow.proto.VerifierConfigOrBuilder> 
-        getPostOptimizationVerifierConfigFieldBuilder() {
+        internalGetPostOptimizationVerifierConfigFieldBuilder() {
       if (postOptimizationVerifierConfigBuilder_ == null) {
         postOptimizationVerifierConfigBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.VerifierConfig, org.tensorflow.proto.VerifierConfig.Builder, org.tensorflow.proto.VerifierConfigOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfigOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfigOrBuilder.java
index b7e13584dda..340eebac55a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfigOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfigOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/rewriter_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface RewriterConfigOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.RewriterConfig)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfigProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfigProtos.java
index d445dbfc551..c84d98e1201 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfigProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RewriterConfigProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/rewriter_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class RewriterConfigProtos {
   private RewriterConfigProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RewriterConfigProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RpcOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RpcOptions.java
index 9dec7784f93..b314d4638ab 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RpcOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RpcOptions.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/rpc_options.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class RpcOptions {
   private RpcOptions() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RpcOptions.class.getName());
   }
@@ -130,8 +131,8 @@ public static final class RPCOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         RPCOptions.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunConfiguration.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunConfiguration.java
index 801a0e56dd3..4cfc4883d11 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunConfiguration.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunConfiguration.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.RunConfiguration}
  */
+@com.google.protobuf.Generated
 public final class RunConfiguration extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.RunConfiguration)
@@ -21,8 +22,8 @@ public final class RunConfiguration extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RunConfiguration.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunConfigurationOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunConfigurationOrBuilder.java
index 1183f95dccd..904df62a1f8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunConfigurationOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunConfigurationOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface RunConfigurationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.RunConfiguration)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunMetadata.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunMetadata.java
index 6fca6234f49..66e3a511947 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunMetadata.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunMetadata.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.RunMetadata}
  */
+@com.google.protobuf.Generated
 public final class RunMetadata extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.RunMetadata)
@@ -21,8 +22,8 @@ public final class RunMetadata extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RunMetadata.class.getName());
   }
@@ -138,8 +139,8 @@ public static final class FunctionGraphs extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         FunctionGraphs.class.getName());
     }
@@ -502,9 +503,9 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getPartitionGraphsFieldBuilder();
-          getPreOptimizationGraphFieldBuilder();
-          getPostOptimizationGraphFieldBuilder();
+          internalGetPartitionGraphsFieldBuilder();
+          internalGetPreOptimizationGraphFieldBuilder();
+          internalGetPostOptimizationGraphFieldBuilder();
         }
       }
       @java.lang.Override
@@ -622,7 +623,7 @@ public Builder mergeFrom(org.tensorflow.proto.RunMetadata.FunctionGraphs other)
               bitField0_ = (bitField0_ & ~0x00000001);
               partitionGraphsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getPartitionGraphsFieldBuilder() : null;
+                   internalGetPartitionGraphsFieldBuilder() : null;
             } else {
               partitionGraphsBuilder_.addAllMessages(other.partitionGraphs_);
             }
@@ -675,14 +676,14 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getPreOptimizationGraphFieldBuilder().getBuilder(),
+                    internalGetPreOptimizationGraphFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
               } // case 18
               case 26: {
                 input.readMessage(
-                    getPostOptimizationGraphFieldBuilder().getBuilder(),
+                    internalGetPostOptimizationGraphFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -936,7 +937,7 @@ public Builder removePartitionGraphs(int index) {
        */
       public org.tensorflow.proto.GraphDef.Builder getPartitionGraphsBuilder(
           int index) {
-        return getPartitionGraphsFieldBuilder().getBuilder(index);
+        return internalGetPartitionGraphsFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -975,7 +976,7 @@ public org.tensorflow.proto.GraphDefOrBuilder getPartitionGraphsOrBuilder(
        * repeated .tensorflow.GraphDef partition_graphs = 1;
        */
       public org.tensorflow.proto.GraphDef.Builder addPartitionGraphsBuilder() {
-        return getPartitionGraphsFieldBuilder().addBuilder(
+        return internalGetPartitionGraphsFieldBuilder().addBuilder(
             org.tensorflow.proto.GraphDef.getDefaultInstance());
       }
       /**
@@ -987,7 +988,7 @@ public org.tensorflow.proto.GraphDef.Builder addPartitionGraphsBuilder() {
        */
       public org.tensorflow.proto.GraphDef.Builder addPartitionGraphsBuilder(
           int index) {
-        return getPartitionGraphsFieldBuilder().addBuilder(
+        return internalGetPartitionGraphsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.GraphDef.getDefaultInstance());
       }
       /**
@@ -999,11 +1000,11 @@ public org.tensorflow.proto.GraphDef.Builder addPartitionGraphsBuilder(
        */
       public java.util.List 
            getPartitionGraphsBuilderList() {
-        return getPartitionGraphsFieldBuilder().getBuilderList();
+        return internalGetPartitionGraphsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder> 
-          getPartitionGraphsFieldBuilder() {
+          internalGetPartitionGraphsFieldBuilder() {
         if (partitionGraphsBuilder_ == null) {
           partitionGraphsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder>(
@@ -1107,7 +1108,7 @@ public Builder clearPreOptimizationGraph() {
       public org.tensorflow.proto.GraphDef.Builder getPreOptimizationGraphBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getPreOptimizationGraphFieldBuilder().getBuilder();
+        return internalGetPreOptimizationGraphFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.GraphDef pre_optimization_graph = 2;
@@ -1125,7 +1126,7 @@ public org.tensorflow.proto.GraphDefOrBuilder getPreOptimizationGraphOrBuilder()
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder> 
-          getPreOptimizationGraphFieldBuilder() {
+          internalGetPreOptimizationGraphFieldBuilder() {
         if (preOptimizationGraphBuilder_ == null) {
           preOptimizationGraphBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder>(
@@ -1228,7 +1229,7 @@ public Builder clearPostOptimizationGraph() {
       public org.tensorflow.proto.GraphDef.Builder getPostOptimizationGraphBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getPostOptimizationGraphFieldBuilder().getBuilder();
+        return internalGetPostOptimizationGraphFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.GraphDef post_optimization_graph = 3;
@@ -1246,7 +1247,7 @@ public org.tensorflow.proto.GraphDefOrBuilder getPostOptimizationGraphOrBuilder(
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder> 
-          getPostOptimizationGraphFieldBuilder() {
+          internalGetPostOptimizationGraphFieldBuilder() {
         if (postOptimizationGraphBuilder_ == null) {
           postOptimizationGraphBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder>(
@@ -1854,11 +1855,11 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getStepStatsFieldBuilder();
-        getCostGraphFieldBuilder();
-        getPartitionGraphsFieldBuilder();
-        getFunctionGraphsFieldBuilder();
-        getSessionMetadataFieldBuilder();
+        internalGetStepStatsFieldBuilder();
+        internalGetCostGraphFieldBuilder();
+        internalGetPartitionGraphsFieldBuilder();
+        internalGetFunctionGraphsFieldBuilder();
+        internalGetSessionMetadataFieldBuilder();
       }
     }
     @java.lang.Override
@@ -2009,7 +2010,7 @@ public Builder mergeFrom(org.tensorflow.proto.RunMetadata other) {
             bitField0_ = (bitField0_ & ~0x00000004);
             partitionGraphsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getPartitionGraphsFieldBuilder() : null;
+                 internalGetPartitionGraphsFieldBuilder() : null;
           } else {
             partitionGraphsBuilder_.addAllMessages(other.partitionGraphs_);
           }
@@ -2035,7 +2036,7 @@ public Builder mergeFrom(org.tensorflow.proto.RunMetadata other) {
             bitField0_ = (bitField0_ & ~0x00000008);
             functionGraphsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getFunctionGraphsFieldBuilder() : null;
+                 internalGetFunctionGraphsFieldBuilder() : null;
           } else {
             functionGraphsBuilder_.addAllMessages(other.functionGraphs_);
           }
@@ -2072,14 +2073,14 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getStepStatsFieldBuilder().getBuilder(),
+                  internalGetStepStatsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
             } // case 10
             case 18: {
               input.readMessage(
-                  getCostGraphFieldBuilder().getBuilder(),
+                  internalGetCostGraphFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -2112,7 +2113,7 @@ public Builder mergeFrom(
             } // case 34
             case 42: {
               input.readMessage(
-                  getSessionMetadataFieldBuilder().getBuilder(),
+                  internalGetSessionMetadataFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000010;
               break;
@@ -2267,7 +2268,7 @@ public Builder clearStepStats() {
     public org.tensorflow.proto.StepStats.Builder getStepStatsBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getStepStatsFieldBuilder().getBuilder();
+      return internalGetStepStatsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2297,7 +2298,7 @@ public org.tensorflow.proto.StepStatsOrBuilder getStepStatsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.StepStats, org.tensorflow.proto.StepStats.Builder, org.tensorflow.proto.StepStatsOrBuilder> 
-        getStepStatsFieldBuilder() {
+        internalGetStepStatsFieldBuilder() {
       if (stepStatsBuilder_ == null) {
         stepStatsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.StepStats, org.tensorflow.proto.StepStats.Builder, org.tensorflow.proto.StepStatsOrBuilder>(
@@ -2428,7 +2429,7 @@ public Builder clearCostGraph() {
     public org.tensorflow.proto.CostGraphDef.Builder getCostGraphBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getCostGraphFieldBuilder().getBuilder();
+      return internalGetCostGraphFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2454,7 +2455,7 @@ public org.tensorflow.proto.CostGraphDefOrBuilder getCostGraphOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CostGraphDef, org.tensorflow.proto.CostGraphDef.Builder, org.tensorflow.proto.CostGraphDefOrBuilder> 
-        getCostGraphFieldBuilder() {
+        internalGetCostGraphFieldBuilder() {
       if (costGraphBuilder_ == null) {
         costGraphBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.CostGraphDef, org.tensorflow.proto.CostGraphDef.Builder, org.tensorflow.proto.CostGraphDefOrBuilder>(
@@ -2698,7 +2699,7 @@ public Builder removePartitionGraphs(int index) {
      */
     public org.tensorflow.proto.GraphDef.Builder getPartitionGraphsBuilder(
         int index) {
-      return getPartitionGraphsFieldBuilder().getBuilder(index);
+      return internalGetPartitionGraphsFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -2737,7 +2738,7 @@ public org.tensorflow.proto.GraphDefOrBuilder getPartitionGraphsOrBuilder(
      * repeated .tensorflow.GraphDef partition_graphs = 3;
      */
     public org.tensorflow.proto.GraphDef.Builder addPartitionGraphsBuilder() {
-      return getPartitionGraphsFieldBuilder().addBuilder(
+      return internalGetPartitionGraphsFieldBuilder().addBuilder(
           org.tensorflow.proto.GraphDef.getDefaultInstance());
     }
     /**
@@ -2749,7 +2750,7 @@ public org.tensorflow.proto.GraphDef.Builder addPartitionGraphsBuilder() {
      */
     public org.tensorflow.proto.GraphDef.Builder addPartitionGraphsBuilder(
         int index) {
-      return getPartitionGraphsFieldBuilder().addBuilder(
+      return internalGetPartitionGraphsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.GraphDef.getDefaultInstance());
     }
     /**
@@ -2761,11 +2762,11 @@ public org.tensorflow.proto.GraphDef.Builder addPartitionGraphsBuilder(
      */
     public java.util.List 
          getPartitionGraphsBuilderList() {
-      return getPartitionGraphsFieldBuilder().getBuilderList();
+      return internalGetPartitionGraphsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder> 
-        getPartitionGraphsFieldBuilder() {
+        internalGetPartitionGraphsFieldBuilder() {
       if (partitionGraphsBuilder_ == null) {
         partitionGraphsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.GraphDef, org.tensorflow.proto.GraphDef.Builder, org.tensorflow.proto.GraphDefOrBuilder>(
@@ -3127,7 +3128,7 @@ public Builder removeFunctionGraphs(int index) {
      */
     public org.tensorflow.proto.RunMetadata.FunctionGraphs.Builder getFunctionGraphsBuilder(
         int index) {
-      return getFunctionGraphsFieldBuilder().getBuilder(index);
+      return internalGetFunctionGraphsFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -3193,7 +3194,7 @@ public org.tensorflow.proto.RunMetadata.FunctionGraphsOrBuilder getFunctionGraph
      * repeated .tensorflow.RunMetadata.FunctionGraphs function_graphs = 4;
      */
     public org.tensorflow.proto.RunMetadata.FunctionGraphs.Builder addFunctionGraphsBuilder() {
-      return getFunctionGraphsFieldBuilder().addBuilder(
+      return internalGetFunctionGraphsFieldBuilder().addBuilder(
           org.tensorflow.proto.RunMetadata.FunctionGraphs.getDefaultInstance());
     }
     /**
@@ -3214,7 +3215,7 @@ public org.tensorflow.proto.RunMetadata.FunctionGraphs.Builder addFunctionGraphs
      */
     public org.tensorflow.proto.RunMetadata.FunctionGraphs.Builder addFunctionGraphsBuilder(
         int index) {
-      return getFunctionGraphsFieldBuilder().addBuilder(
+      return internalGetFunctionGraphsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.RunMetadata.FunctionGraphs.getDefaultInstance());
     }
     /**
@@ -3235,11 +3236,11 @@ public org.tensorflow.proto.RunMetadata.FunctionGraphs.Builder addFunctionGraphs
      */
     public java.util.List 
          getFunctionGraphsBuilderList() {
-      return getFunctionGraphsFieldBuilder().getBuilderList();
+      return internalGetFunctionGraphsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.RunMetadata.FunctionGraphs, org.tensorflow.proto.RunMetadata.FunctionGraphs.Builder, org.tensorflow.proto.RunMetadata.FunctionGraphsOrBuilder> 
-        getFunctionGraphsFieldBuilder() {
+        internalGetFunctionGraphsFieldBuilder() {
       if (functionGraphsBuilder_ == null) {
         functionGraphsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.RunMetadata.FunctionGraphs, org.tensorflow.proto.RunMetadata.FunctionGraphs.Builder, org.tensorflow.proto.RunMetadata.FunctionGraphsOrBuilder>(
@@ -3371,7 +3372,7 @@ public Builder clearSessionMetadata() {
     public org.tensorflow.proto.SessionMetadata.Builder getSessionMetadataBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
-      return getSessionMetadataFieldBuilder().getBuilder();
+      return internalGetSessionMetadataFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -3397,7 +3398,7 @@ public org.tensorflow.proto.SessionMetadataOrBuilder getSessionMetadataOrBuilder
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SessionMetadata, org.tensorflow.proto.SessionMetadata.Builder, org.tensorflow.proto.SessionMetadataOrBuilder> 
-        getSessionMetadataFieldBuilder() {
+        internalGetSessionMetadataFieldBuilder() {
       if (sessionMetadataBuilder_ == null) {
         sessionMetadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.SessionMetadata, org.tensorflow.proto.SessionMetadata.Builder, org.tensorflow.proto.SessionMetadataOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunMetadataOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunMetadataOrBuilder.java
index 4c7e97243da..95d9c2c40cb 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunMetadataOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunMetadataOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface RunMetadataOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.RunMetadata)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunOptions.java
index f7bbbdee26c..ebd5e10bcbd 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunOptions.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.RunOptions}
  */
+@com.google.protobuf.Generated
 public final class RunOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.RunOptions)
@@ -21,8 +22,8 @@ public final class RunOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RunOptions.class.getName());
   }
@@ -80,8 +81,8 @@ public enum TraceLevel
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TraceLevel.class.getName());
     }
@@ -159,7 +160,7 @@ public TraceLevel findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.RunOptions.getDescriptor().getEnumTypes().get(0);
     }
@@ -250,8 +251,8 @@ public static final class Experimental extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Experimental.class.getName());
     }
@@ -306,8 +307,8 @@ public static final class RunHandlerPoolOptions extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           RunHandlerPoolOptions.class.getName());
       }
@@ -1031,7 +1032,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getRunHandlerPoolOptionsFieldBuilder();
+          internalGetRunHandlerPoolOptionsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -1153,7 +1154,7 @@ public Builder mergeFrom(
               } // case 16
               case 26: {
                 input.readMessage(
-                    getRunHandlerPoolOptionsFieldBuilder().getBuilder(),
+                    internalGetRunHandlerPoolOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -1372,7 +1373,7 @@ public Builder clearRunHandlerPoolOptions() {
       public org.tensorflow.proto.RunOptions.Experimental.RunHandlerPoolOptions.Builder getRunHandlerPoolOptionsBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getRunHandlerPoolOptionsFieldBuilder().getBuilder();
+        return internalGetRunHandlerPoolOptionsFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.RunOptions.Experimental.RunHandlerPoolOptions run_handler_pool_options = 3;
@@ -1390,7 +1391,7 @@ public org.tensorflow.proto.RunOptions.Experimental.RunHandlerPoolOptionsOrBuild
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.RunOptions.Experimental.RunHandlerPoolOptions, org.tensorflow.proto.RunOptions.Experimental.RunHandlerPoolOptions.Builder, org.tensorflow.proto.RunOptions.Experimental.RunHandlerPoolOptionsOrBuilder> 
-          getRunHandlerPoolOptionsFieldBuilder() {
+          internalGetRunHandlerPoolOptionsFieldBuilder() {
         if (runHandlerPoolOptionsBuilder_ == null) {
           runHandlerPoolOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.RunOptions.Experimental.RunHandlerPoolOptions, org.tensorflow.proto.RunOptions.Experimental.RunHandlerPoolOptions.Builder, org.tensorflow.proto.RunOptions.Experimental.RunHandlerPoolOptionsOrBuilder>(
@@ -1878,8 +1879,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getDebugOptionsFieldBuilder();
-        getExperimentalFieldBuilder();
+        internalGetDebugOptionsFieldBuilder();
+        internalGetExperimentalFieldBuilder();
       }
     }
     @java.lang.Override
@@ -2046,7 +2047,7 @@ public Builder mergeFrom(
             } // case 40
             case 50: {
               input.readMessage(
-                  getDebugOptionsFieldBuilder().getBuilder(),
+                  internalGetDebugOptionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000010;
               break;
@@ -2058,7 +2059,7 @@ public Builder mergeFrom(
             } // case 56
             case 66: {
               input.readMessage(
-                  getExperimentalFieldBuilder().getBuilder(),
+                  internalGetExperimentalFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000040;
               break;
@@ -2114,9 +2115,7 @@ public org.tensorflow.proto.RunOptions.TraceLevel getTraceLevel() {
      * @return This builder for chaining.
      */
     public Builder setTraceLevel(org.tensorflow.proto.RunOptions.TraceLevel value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       traceLevel_ = value.getNumber();
       onChanged();
@@ -2402,7 +2401,7 @@ public Builder clearDebugOptions() {
     public org.tensorflow.proto.DebugOptions.Builder getDebugOptionsBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
-      return getDebugOptionsFieldBuilder().getBuilder();
+      return internalGetDebugOptionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2428,7 +2427,7 @@ public org.tensorflow.proto.DebugOptionsOrBuilder getDebugOptionsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.DebugOptions, org.tensorflow.proto.DebugOptions.Builder, org.tensorflow.proto.DebugOptionsOrBuilder> 
-        getDebugOptionsFieldBuilder() {
+        internalGetDebugOptionsFieldBuilder() {
       if (debugOptionsBuilder_ == null) {
         debugOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.DebugOptions, org.tensorflow.proto.DebugOptions.Builder, org.tensorflow.proto.DebugOptionsOrBuilder>(
@@ -2587,7 +2586,7 @@ public Builder clearExperimental() {
     public org.tensorflow.proto.RunOptions.Experimental.Builder getExperimentalBuilder() {
       bitField0_ |= 0x00000040;
       onChanged();
-      return getExperimentalFieldBuilder().getBuilder();
+      return internalGetExperimentalFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.RunOptions.Experimental experimental = 8;
@@ -2605,7 +2604,7 @@ public org.tensorflow.proto.RunOptions.ExperimentalOrBuilder getExperimentalOrBu
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.RunOptions.Experimental, org.tensorflow.proto.RunOptions.Experimental.Builder, org.tensorflow.proto.RunOptions.ExperimentalOrBuilder> 
-        getExperimentalFieldBuilder() {
+        internalGetExperimentalFieldBuilder() {
       if (experimentalBuilder_ == null) {
         experimentalBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.RunOptions.Experimental, org.tensorflow.proto.RunOptions.Experimental.Builder, org.tensorflow.proto.RunOptions.ExperimentalOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunOptionsOrBuilder.java
index 7127867def4..e084a2a22e1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/RunOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface RunOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.RunOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaveSliceInfoDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaveSliceInfoDef.java
index 94488b4eaab..43cae5c2367 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaveSliceInfoDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaveSliceInfoDef.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/variable.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.SaveSliceInfoDef}
  */
+@com.google.protobuf.Generated
 public final class SaveSliceInfoDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SaveSliceInfoDef)
@@ -17,8 +18,8 @@ public final class SaveSliceInfoDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SaveSliceInfoDef.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaveSliceInfoDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaveSliceInfoDefOrBuilder.java
index b4cb42c9a44..158592a36a9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaveSliceInfoDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaveSliceInfoDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/variable.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SaveSliceInfoDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SaveSliceInfoDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModel.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModel.java
index ff3c386eb60..5bc9c9fb0f1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModel.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModel.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/saved_model.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.SavedModel}
  */
+@com.google.protobuf.Generated
 public final class SavedModel extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SavedModel)
@@ -22,8 +23,8 @@ public final class SavedModel extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SavedModel.class.getName());
   }
@@ -430,7 +431,7 @@ public Builder mergeFrom(org.tensorflow.proto.SavedModel other) {
             bitField0_ = (bitField0_ & ~0x00000002);
             metaGraphsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getMetaGraphsFieldBuilder() : null;
+                 internalGetMetaGraphsFieldBuilder() : null;
           } else {
             metaGraphsBuilder_.addAllMessages(other.metaGraphs_);
           }
@@ -779,7 +780,7 @@ public Builder removeMetaGraphs(int index) {
      */
     public org.tensorflow.proto.MetaGraphDef.Builder getMetaGraphsBuilder(
         int index) {
-      return getMetaGraphsFieldBuilder().getBuilder(index);
+      return internalGetMetaGraphsFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -818,7 +819,7 @@ public org.tensorflow.proto.MetaGraphDefOrBuilder getMetaGraphsOrBuilder(
      * repeated .tensorflow.MetaGraphDef meta_graphs = 2;
      */
     public org.tensorflow.proto.MetaGraphDef.Builder addMetaGraphsBuilder() {
-      return getMetaGraphsFieldBuilder().addBuilder(
+      return internalGetMetaGraphsFieldBuilder().addBuilder(
           org.tensorflow.proto.MetaGraphDef.getDefaultInstance());
     }
     /**
@@ -830,7 +831,7 @@ public org.tensorflow.proto.MetaGraphDef.Builder addMetaGraphsBuilder() {
      */
     public org.tensorflow.proto.MetaGraphDef.Builder addMetaGraphsBuilder(
         int index) {
-      return getMetaGraphsFieldBuilder().addBuilder(
+      return internalGetMetaGraphsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.MetaGraphDef.getDefaultInstance());
     }
     /**
@@ -842,11 +843,11 @@ public org.tensorflow.proto.MetaGraphDef.Builder addMetaGraphsBuilder(
      */
     public java.util.List 
          getMetaGraphsBuilderList() {
-      return getMetaGraphsFieldBuilder().getBuilderList();
+      return internalGetMetaGraphsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.MetaGraphDef, org.tensorflow.proto.MetaGraphDef.Builder, org.tensorflow.proto.MetaGraphDefOrBuilder> 
-        getMetaGraphsFieldBuilder() {
+        internalGetMetaGraphsFieldBuilder() {
       if (metaGraphsBuilder_ == null) {
         metaGraphsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.MetaGraphDef, org.tensorflow.proto.MetaGraphDef.Builder, org.tensorflow.proto.MetaGraphDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModelOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModelOrBuilder.java
index eb43e5ed042..46cfcbf42f9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModelOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModelOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/saved_model.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SavedModelOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SavedModel)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModelProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModelProtos.java
index 8ccc28afce4..7a8d56a7788 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModelProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedModelProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/saved_model.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class SavedModelProtos {
   private SavedModelProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SavedModelProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedObjectGraphOuterClass.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedObjectGraphOuterClass.java
index b0a72357785..47523432355 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedObjectGraphOuterClass.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedObjectGraphOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/saved_object_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class SavedObjectGraphOuterClass {
   private SavedObjectGraphOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SavedObjectGraphOuterClass.class.getName());
   }
@@ -159,8 +160,8 @@ public static final class SavedObjectGraph extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedObjectGraph.class.getName());
     }
@@ -700,7 +701,7 @@ public Builder mergeFrom(org.tensorflow.proto.SavedObjectGraphOuterClass.SavedOb
               bitField0_ = (bitField0_ & ~0x00000001);
               nodesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getNodesFieldBuilder() : null;
+                   internalGetNodesFieldBuilder() : null;
             } else {
               nodesBuilder_.addAllMessages(other.nodes_);
             }
@@ -1045,7 +1046,7 @@ public Builder removeNodes(int index) {
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.Builder getNodesBuilder(
           int index) {
-        return getNodesFieldBuilder().getBuilder(index);
+        return internalGetNodesFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -1093,7 +1094,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectOrBuilder getN
        * repeated .tensorflow.SavedObject nodes = 1;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.Builder addNodesBuilder() {
-        return getNodesFieldBuilder().addBuilder(
+        return internalGetNodesFieldBuilder().addBuilder(
             org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.getDefaultInstance());
       }
       /**
@@ -1108,7 +1109,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.Builder addNo
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.Builder addNodesBuilder(
           int index) {
-        return getNodesFieldBuilder().addBuilder(
+        return internalGetNodesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.getDefaultInstance());
       }
       /**
@@ -1123,11 +1124,11 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.Builder addNo
        */
       public java.util.List 
            getNodesBuilderList() {
-        return getNodesFieldBuilder().getBuilderList();
+        return internalGetNodesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectOrBuilder> 
-          getNodesFieldBuilder() {
+          internalGetNodesFieldBuilder() {
         if (nodesBuilder_ == null) {
           nodesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObject.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedObjectOrBuilder>(
@@ -1852,8 +1853,8 @@ public static final class SavedObject extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedObject.class.getName());
     }
@@ -3106,10 +3107,10 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getChildrenFieldBuilder();
-          getDependenciesFieldBuilder();
-          getSlotVariablesFieldBuilder();
-          getSerializedUserProtoFieldBuilder();
+          internalGetChildrenFieldBuilder();
+          internalGetDependenciesFieldBuilder();
+          internalGetSlotVariablesFieldBuilder();
+          internalGetSerializedUserProtoFieldBuilder();
         }
       }
       @java.lang.Override
@@ -3324,7 +3325,7 @@ public Builder mergeFrom(org.tensorflow.proto.SavedObjectGraphOuterClass.SavedOb
               bitField0_ = (bitField0_ & ~0x00000001);
               childrenBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getChildrenFieldBuilder() : null;
+                   internalGetChildrenFieldBuilder() : null;
             } else {
               childrenBuilder_.addAllMessages(other.children_);
             }
@@ -3350,7 +3351,7 @@ public Builder mergeFrom(org.tensorflow.proto.SavedObjectGraphOuterClass.SavedOb
               bitField0_ = (bitField0_ & ~0x00000002);
               dependenciesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getDependenciesFieldBuilder() : null;
+                   internalGetDependenciesFieldBuilder() : null;
             } else {
               dependenciesBuilder_.addAllMessages(other.dependencies_);
             }
@@ -3376,7 +3377,7 @@ public Builder mergeFrom(org.tensorflow.proto.SavedObjectGraphOuterClass.SavedOb
               bitField0_ = (bitField0_ & ~0x00000004);
               slotVariablesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getSlotVariablesFieldBuilder() : null;
+                   internalGetSlotVariablesFieldBuilder() : null;
             } else {
               slotVariablesBuilder_.addAllMessages(other.slotVariables_);
             }
@@ -3489,49 +3490,49 @@ public Builder mergeFrom(
               } // case 26
               case 34: {
                 input.readMessage(
-                    getUserObjectFieldBuilder().getBuilder(),
+                    internalGetUserObjectFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 4;
                 break;
               } // case 34
               case 42: {
                 input.readMessage(
-                    getAssetFieldBuilder().getBuilder(),
+                    internalGetAssetFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 5;
                 break;
               } // case 42
               case 50: {
                 input.readMessage(
-                    getFunctionFieldBuilder().getBuilder(),
+                    internalGetFunctionFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 6;
                 break;
               } // case 50
               case 58: {
                 input.readMessage(
-                    getVariableFieldBuilder().getBuilder(),
+                    internalGetVariableFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 7;
                 break;
               } // case 58
               case 66: {
                 input.readMessage(
-                    getBareConcreteFunctionFieldBuilder().getBuilder(),
+                    internalGetBareConcreteFunctionFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 8;
                 break;
               } // case 66
               case 74: {
                 input.readMessage(
-                    getConstantFieldBuilder().getBuilder(),
+                    internalGetConstantFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 9;
                 break;
               } // case 74
               case 82: {
                 input.readMessage(
-                    getResourceFieldBuilder().getBuilder(),
+                    internalGetResourceFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 10;
                 break;
@@ -3547,7 +3548,7 @@ public Builder mergeFrom(
               } // case 90
               case 98: {
                 input.readMessage(
-                    getCapturedTensorFieldBuilder().getBuilder(),
+                    internalGetCapturedTensorFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 12;
                 break;
@@ -3559,7 +3560,7 @@ public Builder mergeFrom(
               } // case 106
               case 114: {
                 input.readMessage(
-                    getSerializedUserProtoFieldBuilder().getBuilder(),
+                    internalGetSerializedUserProtoFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00002000;
                 break;
@@ -3898,7 +3899,7 @@ public Builder removeChildren(int index) {
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder getChildrenBuilder(
           int index) {
-        return getChildrenFieldBuilder().getBuilder(index);
+        return internalGetChildrenFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -3949,7 +3950,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        * repeated .tensorflow.TrackableObjectGraph.TrackableObject.ObjectReference children = 1;
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder addChildrenBuilder() {
-        return getChildrenFieldBuilder().addBuilder(
+        return internalGetChildrenFieldBuilder().addBuilder(
             org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.getDefaultInstance());
       }
       /**
@@ -3965,7 +3966,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder addChildrenBuilder(
           int index) {
-        return getChildrenFieldBuilder().addBuilder(
+        return internalGetChildrenFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.getDefaultInstance());
       }
       /**
@@ -3981,11 +3982,11 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        */
       public java.util.List 
            getChildrenBuilderList() {
-        return getChildrenFieldBuilder().getBuilderList();
+        return internalGetChildrenFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReferenceOrBuilder> 
-          getChildrenFieldBuilder() {
+          internalGetChildrenFieldBuilder() {
         if (childrenBuilder_ == null) {
           childrenBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReferenceOrBuilder>(
@@ -4256,7 +4257,7 @@ public Builder removeDependencies(int index) {
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder getDependenciesBuilder(
           int index) {
-        return getDependenciesFieldBuilder().getBuilder(index);
+        return internalGetDependenciesFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -4301,7 +4302,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        * repeated .tensorflow.TrackableObjectGraph.TrackableObject.ObjectReference dependencies = 15;
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder addDependenciesBuilder() {
-        return getDependenciesFieldBuilder().addBuilder(
+        return internalGetDependenciesFieldBuilder().addBuilder(
             org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.getDefaultInstance());
       }
       /**
@@ -4315,7 +4316,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder addDependenciesBuilder(
           int index) {
-        return getDependenciesFieldBuilder().addBuilder(
+        return internalGetDependenciesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.getDefaultInstance());
       }
       /**
@@ -4329,11 +4330,11 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        */
       public java.util.List 
            getDependenciesBuilderList() {
-        return getDependenciesFieldBuilder().getBuilderList();
+        return internalGetDependenciesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReferenceOrBuilder> 
-          getDependenciesFieldBuilder() {
+          internalGetDependenciesFieldBuilder() {
         if (dependenciesBuilder_ == null) {
           dependenciesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReferenceOrBuilder>(
@@ -4630,7 +4631,7 @@ public Builder removeSlotVariables(int index) {
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder getSlotVariablesBuilder(
           int index) {
-        return getSlotVariablesFieldBuilder().getBuilder(index);
+        return internalGetSlotVariablesFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -4681,7 +4682,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        * repeated .tensorflow.TrackableObjectGraph.TrackableObject.SlotVariableReference slot_variables = 3;
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder addSlotVariablesBuilder() {
-        return getSlotVariablesFieldBuilder().addBuilder(
+        return internalGetSlotVariablesFieldBuilder().addBuilder(
             org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.getDefaultInstance());
       }
       /**
@@ -4697,7 +4698,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder addSlotVariablesBuilder(
           int index) {
-        return getSlotVariablesFieldBuilder().addBuilder(
+        return internalGetSlotVariablesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.getDefaultInstance());
       }
       /**
@@ -4713,11 +4714,11 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        */
       public java.util.List 
            getSlotVariablesBuilderList() {
-        return getSlotVariablesFieldBuilder().getBuilderList();
+        return internalGetSlotVariablesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReferenceOrBuilder> 
-          getSlotVariablesFieldBuilder() {
+          internalGetSlotVariablesFieldBuilder() {
         if (slotVariablesBuilder_ == null) {
           slotVariablesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReferenceOrBuilder>(
@@ -4834,7 +4835,7 @@ public Builder clearUserObject() {
        * .tensorflow.SavedUserObject user_object = 4;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedUserObject.Builder getUserObjectBuilder() {
-        return getUserObjectFieldBuilder().getBuilder();
+        return internalGetUserObjectFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.SavedUserObject user_object = 4;
@@ -4855,7 +4856,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedUserObjectOrBuilder
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedUserObject, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedUserObject.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedUserObjectOrBuilder> 
-          getUserObjectFieldBuilder() {
+          internalGetUserObjectFieldBuilder() {
         if (userObjectBuilder_ == null) {
           if (!(kindCase_ == 4)) {
             kind_ = org.tensorflow.proto.SavedObjectGraphOuterClass.SavedUserObject.getDefaultInstance();
@@ -4976,7 +4977,7 @@ public Builder clearAsset() {
        * .tensorflow.SavedAsset asset = 5;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedAsset.Builder getAssetBuilder() {
-        return getAssetFieldBuilder().getBuilder();
+        return internalGetAssetFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.SavedAsset asset = 5;
@@ -4997,7 +4998,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedAssetOrBuilder getAs
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedAsset, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedAsset.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedAssetOrBuilder> 
-          getAssetFieldBuilder() {
+          internalGetAssetFieldBuilder() {
         if (assetBuilder_ == null) {
           if (!(kindCase_ == 5)) {
             kind_ = org.tensorflow.proto.SavedObjectGraphOuterClass.SavedAsset.getDefaultInstance();
@@ -5118,7 +5119,7 @@ public Builder clearFunction() {
        * .tensorflow.SavedFunction function = 6;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedFunction.Builder getFunctionBuilder() {
-        return getFunctionFieldBuilder().getBuilder();
+        return internalGetFunctionFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.SavedFunction function = 6;
@@ -5139,7 +5140,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedFunctionOrBuilder ge
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedFunction, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedFunction.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedFunctionOrBuilder> 
-          getFunctionFieldBuilder() {
+          internalGetFunctionFieldBuilder() {
         if (functionBuilder_ == null) {
           if (!(kindCase_ == 6)) {
             kind_ = org.tensorflow.proto.SavedObjectGraphOuterClass.SavedFunction.getDefaultInstance();
@@ -5260,7 +5261,7 @@ public Builder clearVariable() {
        * .tensorflow.SavedVariable variable = 7;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder getVariableBuilder() {
-        return getVariableFieldBuilder().getBuilder();
+        return internalGetVariableFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.SavedVariable variable = 7;
@@ -5281,7 +5282,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariableOrBuilder ge
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariableOrBuilder> 
-          getVariableFieldBuilder() {
+          internalGetVariableFieldBuilder() {
         if (variableBuilder_ == null) {
           if (!(kindCase_ == 7)) {
             kind_ = org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.getDefaultInstance();
@@ -5402,7 +5403,7 @@ public Builder clearBareConcreteFunction() {
        * .tensorflow.SavedBareConcreteFunction bare_concrete_function = 8;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedBareConcreteFunction.Builder getBareConcreteFunctionBuilder() {
-        return getBareConcreteFunctionFieldBuilder().getBuilder();
+        return internalGetBareConcreteFunctionFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.SavedBareConcreteFunction bare_concrete_function = 8;
@@ -5423,7 +5424,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedBareConcreteFunction
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedBareConcreteFunction, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedBareConcreteFunction.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedBareConcreteFunctionOrBuilder> 
-          getBareConcreteFunctionFieldBuilder() {
+          internalGetBareConcreteFunctionFieldBuilder() {
         if (bareConcreteFunctionBuilder_ == null) {
           if (!(kindCase_ == 8)) {
             kind_ = org.tensorflow.proto.SavedObjectGraphOuterClass.SavedBareConcreteFunction.getDefaultInstance();
@@ -5544,7 +5545,7 @@ public Builder clearConstant() {
        * .tensorflow.SavedConstant constant = 9;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedConstant.Builder getConstantBuilder() {
-        return getConstantFieldBuilder().getBuilder();
+        return internalGetConstantFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.SavedConstant constant = 9;
@@ -5565,7 +5566,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedConstantOrBuilder ge
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedConstant, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedConstant.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedConstantOrBuilder> 
-          getConstantFieldBuilder() {
+          internalGetConstantFieldBuilder() {
         if (constantBuilder_ == null) {
           if (!(kindCase_ == 9)) {
             kind_ = org.tensorflow.proto.SavedObjectGraphOuterClass.SavedConstant.getDefaultInstance();
@@ -5686,7 +5687,7 @@ public Builder clearResource() {
        * .tensorflow.SavedResource resource = 10;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedResource.Builder getResourceBuilder() {
-        return getResourceFieldBuilder().getBuilder();
+        return internalGetResourceFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.SavedResource resource = 10;
@@ -5707,7 +5708,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedResourceOrBuilder ge
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedResource, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedResource.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedResourceOrBuilder> 
-          getResourceFieldBuilder() {
+          internalGetResourceFieldBuilder() {
         if (resourceBuilder_ == null) {
           if (!(kindCase_ == 10)) {
             kind_ = org.tensorflow.proto.SavedObjectGraphOuterClass.SavedResource.getDefaultInstance();
@@ -5828,7 +5829,7 @@ public Builder clearCapturedTensor() {
        * .tensorflow.CapturedTensor captured_tensor = 12;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.CapturedTensor.Builder getCapturedTensorBuilder() {
-        return getCapturedTensorFieldBuilder().getBuilder();
+        return internalGetCapturedTensorFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.CapturedTensor captured_tensor = 12;
@@ -5849,7 +5850,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.CapturedTensorOrBuilder g
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.CapturedTensor, org.tensorflow.proto.SavedObjectGraphOuterClass.CapturedTensor.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.CapturedTensorOrBuilder> 
-          getCapturedTensorFieldBuilder() {
+          internalGetCapturedTensorFieldBuilder() {
         if (capturedTensorBuilder_ == null) {
           if (!(kindCase_ == 12)) {
             kind_ = org.tensorflow.proto.SavedObjectGraphOuterClass.CapturedTensor.getDefaultInstance();
@@ -6307,7 +6308,7 @@ public Builder clearSerializedUserProto() {
       public com.google.protobuf.Any.Builder getSerializedUserProtoBuilder() {
         bitField0_ |= 0x00002000;
         onChanged();
-        return getSerializedUserProtoFieldBuilder().getBuilder();
+        return internalGetSerializedUserProtoFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -6337,7 +6338,7 @@ public com.google.protobuf.AnyOrBuilder getSerializedUserProtoOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder> 
-          getSerializedUserProtoFieldBuilder() {
+          internalGetSerializedUserProtoFieldBuilder() {
         if (serializedUserProtoBuilder_ == null) {
           serializedUserProtoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder>(
@@ -6601,8 +6602,8 @@ public static final class SavedUserObject extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedUserObject.class.getName());
     }
@@ -6997,7 +6998,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getVersionFieldBuilder();
+          internalGetVersionFieldBuilder();
         }
       }
       @java.lang.Override
@@ -7118,7 +7119,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getVersionFieldBuilder().getBuilder(),
+                    internalGetVersionFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -7356,7 +7357,7 @@ public Builder clearVersion() {
       public org.tensorflow.proto.VersionDef.Builder getVersionBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getVersionFieldBuilder().getBuilder();
+        return internalGetVersionFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -7382,7 +7383,7 @@ public org.tensorflow.proto.VersionDefOrBuilder getVersionOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder> 
-          getVersionFieldBuilder() {
+          internalGetVersionFieldBuilder() {
         if (versionBuilder_ == null) {
           versionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder>(
@@ -7604,8 +7605,8 @@ public static final class SavedAsset extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedAsset.class.getName());
     }
@@ -8112,8 +8113,8 @@ public static final class SavedFunction extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedFunction.class.getName());
     }
@@ -8419,7 +8420,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getFunctionSpecFieldBuilder();
+          internalGetFunctionSpecFieldBuilder();
         }
       }
       @java.lang.Override
@@ -8539,7 +8540,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getFunctionSpecFieldBuilder().getBuilder(),
+                    internalGetFunctionSpecFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -8763,7 +8764,7 @@ public Builder clearFunctionSpec() {
       public org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.Builder getFunctionSpecBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getFunctionSpecFieldBuilder().getBuilder();
+        return internalGetFunctionSpecFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.FunctionSpec function_spec = 2;
@@ -8781,7 +8782,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpecOrBuilder get
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec, org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpecOrBuilder> 
-          getFunctionSpecFieldBuilder() {
+          internalGetFunctionSpecFieldBuilder() {
         if (functionSpecBuilder_ == null) {
           functionSpecBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec, org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpecOrBuilder>(
@@ -8900,8 +8901,8 @@ public static final class CapturedTensor extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CapturedTensor.class.getName());
     }
@@ -9675,8 +9676,8 @@ public static final class SavedConcreteFunction extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedConcreteFunction.class.getName());
     }
@@ -10061,8 +10062,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getCanonicalizedInputSignatureFieldBuilder();
-          getOutputSignatureFieldBuilder();
+          internalGetCanonicalizedInputSignatureFieldBuilder();
+          internalGetOutputSignatureFieldBuilder();
         }
       }
       @java.lang.Override
@@ -10206,14 +10207,14 @@ public Builder mergeFrom(
               } // case 18
               case 26: {
                 input.readMessage(
-                    getCanonicalizedInputSignatureFieldBuilder().getBuilder(),
+                    internalGetCanonicalizedInputSignatureFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
               } // case 26
               case 34: {
                 input.readMessage(
-                    getOutputSignatureFieldBuilder().getBuilder(),
+                    internalGetOutputSignatureFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -10445,7 +10446,7 @@ public Builder clearCanonicalizedInputSignature() {
       public org.tensorflow.proto.Struct.StructuredValue.Builder getCanonicalizedInputSignatureBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getCanonicalizedInputSignatureFieldBuilder().getBuilder();
+        return internalGetCanonicalizedInputSignatureFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -10473,7 +10474,7 @@ public org.tensorflow.proto.Struct.StructuredValueOrBuilder getCanonicalizedInpu
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder> 
-          getCanonicalizedInputSignatureFieldBuilder() {
+          internalGetCanonicalizedInputSignatureFieldBuilder() {
         if (canonicalizedInputSignatureBuilder_ == null) {
           canonicalizedInputSignatureBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder>(
@@ -10618,7 +10619,7 @@ public Builder clearOutputSignature() {
       public org.tensorflow.proto.Struct.StructuredValue.Builder getOutputSignatureBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getOutputSignatureFieldBuilder().getBuilder();
+        return internalGetOutputSignatureFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -10648,7 +10649,7 @@ public org.tensorflow.proto.Struct.StructuredValueOrBuilder getOutputSignatureOr
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder> 
-          getOutputSignatureFieldBuilder() {
+          internalGetOutputSignatureFieldBuilder() {
         if (outputSignatureBuilder_ == null) {
           outputSignatureBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder>(
@@ -10840,8 +10841,8 @@ public static final class SavedBareConcreteFunction extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedBareConcreteFunction.class.getName());
     }
@@ -11271,7 +11272,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getFunctionSpecFieldBuilder();
+          internalGetFunctionSpecFieldBuilder();
         }
       }
       @java.lang.Override
@@ -11417,7 +11418,7 @@ public Builder mergeFrom(
               } // case 24
               case 34: {
                 input.readMessage(
-                    getFunctionSpecFieldBuilder().getBuilder(),
+                    internalGetFunctionSpecFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000008;
                 break;
@@ -11876,7 +11877,7 @@ public Builder clearFunctionSpec() {
       public org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.Builder getFunctionSpecBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
-        return getFunctionSpecFieldBuilder().getBuilder();
+        return internalGetFunctionSpecFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -11912,7 +11913,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpecOrBuilder get
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec, org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpecOrBuilder> 
-          getFunctionSpecFieldBuilder() {
+          internalGetFunctionSpecFieldBuilder() {
         if (functionSpecBuilder_ == null) {
           functionSpecBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec, org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpecOrBuilder>(
@@ -12011,8 +12012,8 @@ public static final class SavedConstant extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedConstant.class.getName());
     }
@@ -12689,8 +12690,8 @@ public static final class SavedVariable extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedVariable.class.getName());
     }
@@ -13251,8 +13252,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getShapeFieldBuilder();
-          getExperimentalDistributedVariableComponentsFieldBuilder();
+          internalGetShapeFieldBuilder();
+          internalGetExperimentalDistributedVariableComponentsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -13408,7 +13409,7 @@ public Builder mergeFrom(org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVa
               bitField0_ = (bitField0_ & ~0x00000080);
               experimentalDistributedVariableComponentsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getExperimentalDistributedVariableComponentsFieldBuilder() : null;
+                   internalGetExperimentalDistributedVariableComponentsFieldBuilder() : null;
             } else {
               experimentalDistributedVariableComponentsBuilder_.addAllMessages(other.experimentalDistributedVariableComponents_);
             }
@@ -13447,7 +13448,7 @@ public Builder mergeFrom(
               } // case 8
               case 18: {
                 input.readMessage(
-                    getShapeFieldBuilder().getBuilder(),
+                    internalGetShapeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -13541,9 +13542,7 @@ public org.tensorflow.proto.DataType getDtype() {
        * @return This builder for chaining.
        */
       public Builder setDtype(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         dtype_ = value.getNumber();
         onChanged();
@@ -13651,7 +13650,7 @@ public Builder clearShape() {
       public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getShapeFieldBuilder().getBuilder();
+        return internalGetShapeFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TensorShapeProto shape = 2;
@@ -13669,7 +13668,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getShapeFieldBuilder() {
+          internalGetShapeFieldBuilder() {
         if (shapeBuilder_ == null) {
           shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -13747,9 +13746,7 @@ public org.tensorflow.proto.VariableSynchronization getSynchronization() {
        * @return This builder for chaining.
        */
       public Builder setSynchronization(org.tensorflow.proto.VariableSynchronization value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000008;
         synchronization_ = value.getNumber();
         onChanged();
@@ -13800,9 +13797,7 @@ public org.tensorflow.proto.VariableAggregation getAggregation() {
        * @return This builder for chaining.
        */
       public Builder setAggregation(org.tensorflow.proto.VariableAggregation value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000010;
         aggregation_ = value.getNumber();
         onChanged();
@@ -14260,7 +14255,7 @@ public Builder removeExperimentalDistributedVariableComponents(int index) {
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder getExperimentalDistributedVariableComponentsBuilder(
           int index) {
-        return getExperimentalDistributedVariableComponentsFieldBuilder().getBuilder(index);
+        return internalGetExperimentalDistributedVariableComponentsFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -14314,7 +14309,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariableOrBuilder ge
        * repeated .tensorflow.SavedVariable experimental_distributed_variable_components = 8;
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder addExperimentalDistributedVariableComponentsBuilder() {
-        return getExperimentalDistributedVariableComponentsFieldBuilder().addBuilder(
+        return internalGetExperimentalDistributedVariableComponentsFieldBuilder().addBuilder(
             org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.getDefaultInstance());
       }
       /**
@@ -14331,7 +14326,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder add
        */
       public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder addExperimentalDistributedVariableComponentsBuilder(
           int index) {
-        return getExperimentalDistributedVariableComponentsFieldBuilder().addBuilder(
+        return internalGetExperimentalDistributedVariableComponentsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.getDefaultInstance());
       }
       /**
@@ -14348,11 +14343,11 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder add
        */
       public java.util.List 
            getExperimentalDistributedVariableComponentsBuilderList() {
-        return getExperimentalDistributedVariableComponentsFieldBuilder().getBuilderList();
+        return internalGetExperimentalDistributedVariableComponentsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariableOrBuilder> 
-          getExperimentalDistributedVariableComponentsFieldBuilder() {
+          internalGetExperimentalDistributedVariableComponentsFieldBuilder() {
         if (experimentalDistributedVariableComponentsBuilder_ == null) {
           experimentalDistributedVariableComponentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariable.Builder, org.tensorflow.proto.SavedObjectGraphOuterClass.SavedVariableOrBuilder>(
@@ -14512,8 +14507,8 @@ public static final class FunctionSpec extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         FunctionSpec.class.getName());
     }
@@ -14573,8 +14568,8 @@ public enum JitCompile
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           JitCompile.class.getName());
       }
@@ -14647,7 +14642,7 @@ public JitCompile findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.getDescriptor().getEnumTypes().get(0);
       }
@@ -15023,8 +15018,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getFullargspecFieldBuilder();
-          getInputSignatureFieldBuilder();
+          internalGetFullargspecFieldBuilder();
+          internalGetInputSignatureFieldBuilder();
         }
       }
       @java.lang.Override
@@ -15150,7 +15145,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getFullargspecFieldBuilder().getBuilder(),
+                    internalGetFullargspecFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -15162,7 +15157,7 @@ public Builder mergeFrom(
               } // case 16
               case 42: {
                 input.readMessage(
-                    getInputSignatureFieldBuilder().getBuilder(),
+                    internalGetInputSignatureFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -15308,7 +15303,7 @@ public Builder clearFullargspec() {
       public org.tensorflow.proto.Struct.StructuredValue.Builder getFullargspecBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getFullargspecFieldBuilder().getBuilder();
+        return internalGetFullargspecFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -15334,7 +15329,7 @@ public org.tensorflow.proto.Struct.StructuredValueOrBuilder getFullargspecOrBuil
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder> 
-          getFullargspecFieldBuilder() {
+          internalGetFullargspecFieldBuilder() {
         if (fullargspecBuilder_ == null) {
           fullargspecBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder>(
@@ -15509,7 +15504,7 @@ public Builder clearInputSignature() {
       public org.tensorflow.proto.Struct.StructuredValue.Builder getInputSignatureBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getInputSignatureFieldBuilder().getBuilder();
+        return internalGetInputSignatureFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -15535,7 +15530,7 @@ public org.tensorflow.proto.Struct.StructuredValueOrBuilder getInputSignatureOrB
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder> 
-          getInputSignatureFieldBuilder() {
+          internalGetInputSignatureFieldBuilder() {
         if (inputSignatureBuilder_ == null) {
           inputSignatureBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder>(
@@ -15581,9 +15576,7 @@ public org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.JitCompile g
        * @return This builder for chaining.
        */
       public Builder setJitCompile(org.tensorflow.proto.SavedObjectGraphOuterClass.FunctionSpec.JitCompile value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000008;
         jitCompile_ = value.getNumber();
         onChanged();
@@ -15697,8 +15690,8 @@ public static final class SavedResource extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SavedResource.class.getName());
     }
@@ -16260,8 +16253,8 @@ public static final class SaveableObject extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SaveableObject.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSlice.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSlice.java
index f25165bb36a..6d1e6a11820 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSlice.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSlice.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.SavedSlice}
  */
+@com.google.protobuf.Generated
 public final class SavedSlice extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SavedSlice)
@@ -22,8 +23,8 @@ public final class SavedSlice extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SavedSlice.class.getName());
   }
@@ -406,8 +407,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getSliceFieldBuilder();
-        getDataFieldBuilder();
+        internalGetSliceFieldBuilder();
+        internalGetDataFieldBuilder();
       }
     }
     @java.lang.Override
@@ -533,14 +534,14 @@ public Builder mergeFrom(
             } // case 10
             case 18: {
               input.readMessage(
-                  getSliceFieldBuilder().getBuilder(),
+                  internalGetSliceFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
             } // case 18
             case 26: {
               input.readMessage(
-                  getDataFieldBuilder().getBuilder(),
+                  internalGetDataFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
@@ -785,7 +786,7 @@ public Builder clearSlice() {
     public org.tensorflow.proto.TensorSliceProto.Builder getSliceBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getSliceFieldBuilder().getBuilder();
+      return internalGetSliceFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -813,7 +814,7 @@ public org.tensorflow.proto.TensorSliceProtoOrBuilder getSliceOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorSliceProto, org.tensorflow.proto.TensorSliceProto.Builder, org.tensorflow.proto.TensorSliceProtoOrBuilder> 
-        getSliceFieldBuilder() {
+        internalGetSliceFieldBuilder() {
       if (sliceBuilder_ == null) {
         sliceBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorSliceProto, org.tensorflow.proto.TensorSliceProto.Builder, org.tensorflow.proto.TensorSliceProtoOrBuilder>(
@@ -951,7 +952,7 @@ public Builder clearData() {
     public org.tensorflow.proto.TensorProto.Builder getDataBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getDataFieldBuilder().getBuilder();
+      return internalGetDataFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -979,7 +980,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getDataOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-        getDataFieldBuilder() {
+        internalGetDataFieldBuilder() {
       if (dataBuilder_ == null) {
         dataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceMeta.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceMeta.java
index 6718d0c6493..49cf5eb182a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceMeta.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceMeta.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.SavedSliceMeta}
  */
+@com.google.protobuf.Generated
 public final class SavedSliceMeta extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SavedSliceMeta)
@@ -22,8 +23,8 @@ public final class SavedSliceMeta extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SavedSliceMeta.class.getName());
   }
@@ -456,8 +457,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getShapeFieldBuilder();
-        getSliceFieldBuilder();
+        internalGetShapeFieldBuilder();
+        internalGetSliceFieldBuilder();
       }
     }
     @java.lang.Override
@@ -583,7 +584,7 @@ public Builder mergeFrom(org.tensorflow.proto.SavedSliceMeta other) {
             bitField0_ = (bitField0_ & ~0x00000008);
             sliceBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getSliceFieldBuilder() : null;
+                 internalGetSliceFieldBuilder() : null;
           } else {
             sliceBuilder_.addAllMessages(other.slice_);
           }
@@ -622,7 +623,7 @@ public Builder mergeFrom(
             } // case 10
             case 18: {
               input.readMessage(
-                  getShapeFieldBuilder().getBuilder(),
+                  internalGetShapeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -873,7 +874,7 @@ public Builder clearShape() {
     public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getShapeFieldBuilder().getBuilder();
+      return internalGetShapeFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -899,7 +900,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-        getShapeFieldBuilder() {
+        internalGetShapeFieldBuilder() {
       if (shapeBuilder_ == null) {
         shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -961,9 +962,7 @@ public org.tensorflow.proto.DataType getType() {
      * @return This builder for chaining.
      */
     public Builder setType(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000004;
       type_ = value.getNumber();
       onChanged();
@@ -1216,7 +1215,7 @@ public Builder removeSlice(int index) {
      */
     public org.tensorflow.proto.TensorSliceProto.Builder getSliceBuilder(
         int index) {
-      return getSliceFieldBuilder().getBuilder(index);
+      return internalGetSliceFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1255,7 +1254,7 @@ public org.tensorflow.proto.TensorSliceProtoOrBuilder getSliceOrBuilder(
      * repeated .tensorflow.TensorSliceProto slice = 4;
      */
     public org.tensorflow.proto.TensorSliceProto.Builder addSliceBuilder() {
-      return getSliceFieldBuilder().addBuilder(
+      return internalGetSliceFieldBuilder().addBuilder(
           org.tensorflow.proto.TensorSliceProto.getDefaultInstance());
     }
     /**
@@ -1267,7 +1266,7 @@ public org.tensorflow.proto.TensorSliceProto.Builder addSliceBuilder() {
      */
     public org.tensorflow.proto.TensorSliceProto.Builder addSliceBuilder(
         int index) {
-      return getSliceFieldBuilder().addBuilder(
+      return internalGetSliceFieldBuilder().addBuilder(
           index, org.tensorflow.proto.TensorSliceProto.getDefaultInstance());
     }
     /**
@@ -1279,11 +1278,11 @@ public org.tensorflow.proto.TensorSliceProto.Builder addSliceBuilder(
      */
     public java.util.List 
          getSliceBuilderList() {
-      return getSliceFieldBuilder().getBuilderList();
+      return internalGetSliceFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.TensorSliceProto, org.tensorflow.proto.TensorSliceProto.Builder, org.tensorflow.proto.TensorSliceProtoOrBuilder> 
-        getSliceFieldBuilder() {
+        internalGetSliceFieldBuilder() {
       if (sliceBuilder_ == null) {
         sliceBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TensorSliceProto, org.tensorflow.proto.TensorSliceProto.Builder, org.tensorflow.proto.TensorSliceProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceMetaOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceMetaOrBuilder.java
index b16e0be04c9..652da6151dd 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceMetaOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceMetaOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SavedSliceMetaOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SavedSliceMeta)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceOrBuilder.java
index 0b485f9caca..eab28692d36 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedSliceOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SavedSliceOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SavedSlice)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceMeta.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceMeta.java
index ebe9c66228b..e6ca5f2964d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceMeta.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceMeta.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.SavedTensorSliceMeta}
  */
+@com.google.protobuf.Generated
 public final class SavedTensorSliceMeta extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SavedTensorSliceMeta)
@@ -22,8 +23,8 @@ public final class SavedTensorSliceMeta extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SavedTensorSliceMeta.class.getName());
   }
@@ -364,8 +365,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorFieldBuilder();
-        getVersionsFieldBuilder();
+        internalGetTensorFieldBuilder();
+        internalGetVersionsFieldBuilder();
       }
     }
     @java.lang.Override
@@ -472,7 +473,7 @@ public Builder mergeFrom(org.tensorflow.proto.SavedTensorSliceMeta other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             tensorBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getTensorFieldBuilder() : null;
+                 internalGetTensorFieldBuilder() : null;
           } else {
             tensorBuilder_.addAllMessages(other.tensor_);
           }
@@ -522,7 +523,7 @@ public Builder mergeFrom(
             } // case 10
             case 18: {
               input.readMessage(
-                  getVersionsFieldBuilder().getBuilder(),
+                  internalGetVersionsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -776,7 +777,7 @@ public Builder removeTensor(int index) {
      */
     public org.tensorflow.proto.SavedSliceMeta.Builder getTensorBuilder(
         int index) {
-      return getTensorFieldBuilder().getBuilder(index);
+      return internalGetTensorFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -815,7 +816,7 @@ public org.tensorflow.proto.SavedSliceMetaOrBuilder getTensorOrBuilder(
      * repeated .tensorflow.SavedSliceMeta tensor = 1;
      */
     public org.tensorflow.proto.SavedSliceMeta.Builder addTensorBuilder() {
-      return getTensorFieldBuilder().addBuilder(
+      return internalGetTensorFieldBuilder().addBuilder(
           org.tensorflow.proto.SavedSliceMeta.getDefaultInstance());
     }
     /**
@@ -827,7 +828,7 @@ public org.tensorflow.proto.SavedSliceMeta.Builder addTensorBuilder() {
      */
     public org.tensorflow.proto.SavedSliceMeta.Builder addTensorBuilder(
         int index) {
-      return getTensorFieldBuilder().addBuilder(
+      return internalGetTensorFieldBuilder().addBuilder(
           index, org.tensorflow.proto.SavedSliceMeta.getDefaultInstance());
     }
     /**
@@ -839,11 +840,11 @@ public org.tensorflow.proto.SavedSliceMeta.Builder addTensorBuilder(
      */
     public java.util.List 
          getTensorBuilderList() {
-      return getTensorFieldBuilder().getBuilderList();
+      return internalGetTensorFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.SavedSliceMeta, org.tensorflow.proto.SavedSliceMeta.Builder, org.tensorflow.proto.SavedSliceMetaOrBuilder> 
-        getTensorFieldBuilder() {
+        internalGetTensorFieldBuilder() {
       if (tensorBuilder_ == null) {
         tensorBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.SavedSliceMeta, org.tensorflow.proto.SavedSliceMeta.Builder, org.tensorflow.proto.SavedSliceMetaOrBuilder>(
@@ -982,7 +983,7 @@ public Builder clearVersions() {
     public org.tensorflow.proto.VersionDef.Builder getVersionsBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getVersionsFieldBuilder().getBuilder();
+      return internalGetVersionsFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1010,7 +1011,7 @@ public org.tensorflow.proto.VersionDefOrBuilder getVersionsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder> 
-        getVersionsFieldBuilder() {
+        internalGetVersionsFieldBuilder() {
       if (versionsBuilder_ == null) {
         versionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.VersionDef, org.tensorflow.proto.VersionDef.Builder, org.tensorflow.proto.VersionDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceMetaOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceMetaOrBuilder.java
index bb69dc63e26..e173f37068b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceMetaOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceMetaOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SavedTensorSliceMetaOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SavedTensorSliceMeta)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceProtos.java
index 57c5be9c252..bb451fb39ef 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSliceProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class SavedTensorSliceProtos {
   private SavedTensorSliceProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SavedTensorSliceProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSlices.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSlices.java
index 73a6edbc8d1..4faaa93dd81 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSlices.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSlices.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.SavedTensorSlices}
  */
+@com.google.protobuf.Generated
 public final class SavedTensorSlices extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SavedTensorSlices)
@@ -22,8 +23,8 @@ public final class SavedTensorSlices extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SavedTensorSlices.class.getName());
   }
@@ -343,8 +344,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getMetaFieldBuilder();
-        getDataFieldBuilder();
+        internalGetMetaFieldBuilder();
+        internalGetDataFieldBuilder();
       }
     }
     @java.lang.Override
@@ -456,14 +457,14 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getMetaFieldBuilder().getBuilder(),
+                  internalGetMetaFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
             } // case 10
             case 18: {
               input.readMessage(
-                  getDataFieldBuilder().getBuilder(),
+                  internalGetDataFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -611,7 +612,7 @@ public Builder clearMeta() {
     public org.tensorflow.proto.SavedTensorSliceMeta.Builder getMetaBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getMetaFieldBuilder().getBuilder();
+      return internalGetMetaFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -639,7 +640,7 @@ public org.tensorflow.proto.SavedTensorSliceMetaOrBuilder getMetaOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SavedTensorSliceMeta, org.tensorflow.proto.SavedTensorSliceMeta.Builder, org.tensorflow.proto.SavedTensorSliceMetaOrBuilder> 
-        getMetaFieldBuilder() {
+        internalGetMetaFieldBuilder() {
       if (metaBuilder_ == null) {
         metaBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.SavedTensorSliceMeta, org.tensorflow.proto.SavedTensorSliceMeta.Builder, org.tensorflow.proto.SavedTensorSliceMetaOrBuilder>(
@@ -770,7 +771,7 @@ public Builder clearData() {
     public org.tensorflow.proto.SavedSlice.Builder getDataBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getDataFieldBuilder().getBuilder();
+      return internalGetDataFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -796,7 +797,7 @@ public org.tensorflow.proto.SavedSliceOrBuilder getDataOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SavedSlice, org.tensorflow.proto.SavedSlice.Builder, org.tensorflow.proto.SavedSliceOrBuilder> 
-        getDataFieldBuilder() {
+        internalGetDataFieldBuilder() {
       if (dataBuilder_ == null) {
         dataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.SavedSlice, org.tensorflow.proto.SavedSlice.Builder, org.tensorflow.proto.SavedSliceOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSlicesOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSlicesOrBuilder.java
index b22a704bc31..d07fe976b75 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSlicesOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SavedTensorSlicesOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/saved_tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SavedTensorSlicesOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SavedTensorSlices)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverDef.java
index c7940c18c50..9e3ecf281b7 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/saver.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.SaverDef}
  */
+@com.google.protobuf.Generated
 public final class SaverDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SaverDef)
@@ -21,8 +22,8 @@ public final class SaverDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SaverDef.class.getName());
   }
@@ -93,8 +94,8 @@ public enum CheckpointFormatVersion
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CheckpointFormatVersion.class.getName());
     }
@@ -179,7 +180,7 @@ public CheckpointFormatVersion findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.SaverDef.getDescriptor().getEnumTypes().get(0);
     }
@@ -772,7 +773,7 @@ public Builder mergeFrom(org.tensorflow.proto.SaverDef other) {
       if (other.getSharded() != false) {
         setSharded(other.getSharded());
       }
-      if (other.getKeepCheckpointEveryNHours() != 0F) {
+      if (java.lang.Float.floatToRawIntBits(other.getKeepCheckpointEveryNHours()) != 0) {
         setKeepCheckpointEveryNHours(other.getKeepCheckpointEveryNHours());
       }
       if (other.version_ != 0) {
@@ -1312,9 +1313,7 @@ public org.tensorflow.proto.SaverDef.CheckpointFormatVersion getVersion() {
      * @return This builder for chaining.
      */
     public Builder setVersion(org.tensorflow.proto.SaverDef.CheckpointFormatVersion value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000040;
       version_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverDefOrBuilder.java
index 22751b6cd6c..40ae0df10c2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/saver.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SaverDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SaverDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverProtos.java
index 09a24e9951c..ccd192469f9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SaverProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/saver.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class SaverProtos {
   private SaverProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SaverProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ScopedAllocatorOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ScopedAllocatorOptions.java
index 688a251a612..fbb56be20dc 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ScopedAllocatorOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ScopedAllocatorOptions.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/rewriter_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.ScopedAllocatorOptions}
  */
+@com.google.protobuf.Generated
 public final class ScopedAllocatorOptions extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ScopedAllocatorOptions)
@@ -17,8 +18,8 @@ public final class ScopedAllocatorOptions extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ScopedAllocatorOptions.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ScopedAllocatorOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ScopedAllocatorOptionsOrBuilder.java
index 34a7e2c7eaf..2d8b8b1740d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ScopedAllocatorOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ScopedAllocatorOptionsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/rewriter_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ScopedAllocatorOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ScopedAllocatorOptions)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SequenceExample.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SequenceExample.java
index 37deaaff1a8..1ae3d7db4f0 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SequenceExample.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SequenceExample.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.SequenceExample}
  */
+@com.google.protobuf.Generated
 public final class SequenceExample extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SequenceExample)
@@ -17,8 +18,8 @@ public final class SequenceExample extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SequenceExample.class.getName());
   }
@@ -306,8 +307,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getContextFieldBuilder();
-        getFeatureListsFieldBuilder();
+        internalGetContextFieldBuilder();
+        internalGetFeatureListsFieldBuilder();
       }
     }
     @java.lang.Override
@@ -419,14 +420,14 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getContextFieldBuilder().getBuilder(),
+                  internalGetContextFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
             } // case 10
             case 18: {
               input.readMessage(
-                  getFeatureListsFieldBuilder().getBuilder(),
+                  internalGetFeatureListsFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -539,7 +540,7 @@ public Builder clearContext() {
     public org.tensorflow.proto.Features.Builder getContextBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getContextFieldBuilder().getBuilder();
+      return internalGetContextFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.Features context = 1;
@@ -557,7 +558,7 @@ public org.tensorflow.proto.FeaturesOrBuilder getContextOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.Features, org.tensorflow.proto.Features.Builder, org.tensorflow.proto.FeaturesOrBuilder> 
-        getContextFieldBuilder() {
+        internalGetContextFieldBuilder() {
       if (contextBuilder_ == null) {
         contextBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.Features, org.tensorflow.proto.Features.Builder, org.tensorflow.proto.FeaturesOrBuilder>(
@@ -660,7 +661,7 @@ public Builder clearFeatureLists() {
     public org.tensorflow.proto.FeatureLists.Builder getFeatureListsBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getFeatureListsFieldBuilder().getBuilder();
+      return internalGetFeatureListsFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.FeatureLists feature_lists = 2;
@@ -678,7 +679,7 @@ public org.tensorflow.proto.FeatureListsOrBuilder getFeatureListsOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.FeatureLists, org.tensorflow.proto.FeatureLists.Builder, org.tensorflow.proto.FeatureListsOrBuilder> 
-        getFeatureListsFieldBuilder() {
+        internalGetFeatureListsFieldBuilder() {
       if (featureListsBuilder_ == null) {
         featureListsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.FeatureLists, org.tensorflow.proto.FeatureLists.Builder, org.tensorflow.proto.FeatureListsOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SequenceExampleOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SequenceExampleOrBuilder.java
index e38f99c7f8f..ee00bcfadba 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SequenceExampleOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SequenceExampleOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SequenceExampleOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SequenceExample)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SerializedDType.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SerializedDType.java
index a1c9bf8580b..8ebc8dd4236 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SerializedDType.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SerializedDType.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/types.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.SerializedDType}
  */
+@com.google.protobuf.Generated
 public final class SerializedDType extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SerializedDType)
@@ -21,8 +22,8 @@ public final class SerializedDType extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SerializedDType.class.getName());
   }
@@ -395,9 +396,7 @@ public org.tensorflow.proto.DataType getDatatype() {
      * @return This builder for chaining.
      */
     public Builder setDatatype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       datatype_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SerializedDTypeOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SerializedDTypeOrBuilder.java
index ffadd4ef5f2..34bbb08782f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SerializedDTypeOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SerializedDTypeOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/types.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SerializedDTypeOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SerializedDType)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerDef.java
index 961f896b0c1..68f0e6421e9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/tensorflow_server.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.ServerDef}
  */
+@com.google.protobuf.Generated
 public final class ServerDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ServerDef)
@@ -21,8 +22,8 @@ public final class ServerDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ServerDef.class.getName());
   }
@@ -602,9 +603,9 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getClusterFieldBuilder();
-        getDefaultSessionConfigFieldBuilder();
-        getClusterDeviceFiltersFieldBuilder();
+        internalGetClusterFieldBuilder();
+        internalGetDefaultSessionConfigFieldBuilder();
+        internalGetClusterDeviceFiltersFieldBuilder();
       }
     }
     @java.lang.Override
@@ -769,7 +770,7 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getClusterFieldBuilder().getBuilder(),
+                  internalGetClusterFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
@@ -786,7 +787,7 @@ public Builder mergeFrom(
             } // case 24
             case 34: {
               input.readMessage(
-                  getDefaultSessionConfigFieldBuilder().getBuilder(),
+                  internalGetDefaultSessionConfigFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000010;
               break;
@@ -803,7 +804,7 @@ public Builder mergeFrom(
             } // case 48
             case 58: {
               input.readMessage(
-                  getClusterDeviceFiltersFieldBuilder().getBuilder(),
+                  internalGetClusterDeviceFiltersFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000080;
               break;
@@ -949,7 +950,7 @@ public Builder clearCluster() {
     public org.tensorflow.proto.ClusterDef.Builder getClusterBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getClusterFieldBuilder().getBuilder();
+      return internalGetClusterFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -975,7 +976,7 @@ public org.tensorflow.proto.ClusterDefOrBuilder getClusterOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.ClusterDef, org.tensorflow.proto.ClusterDef.Builder, org.tensorflow.proto.ClusterDefOrBuilder> 
-        getClusterFieldBuilder() {
+        internalGetClusterFieldBuilder() {
       if (clusterBuilder_ == null) {
         clusterBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.ClusterDef, org.tensorflow.proto.ClusterDef.Builder, org.tensorflow.proto.ClusterDefOrBuilder>(
@@ -1310,7 +1311,7 @@ public Builder clearDefaultSessionConfig() {
     public org.tensorflow.proto.ConfigProto.Builder getDefaultSessionConfigBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
-      return getDefaultSessionConfigFieldBuilder().getBuilder();
+      return internalGetDefaultSessionConfigFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1336,7 +1337,7 @@ public org.tensorflow.proto.ConfigProtoOrBuilder getDefaultSessionConfigOrBuilde
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.ConfigProto, org.tensorflow.proto.ConfigProto.Builder, org.tensorflow.proto.ConfigProtoOrBuilder> 
-        getDefaultSessionConfigFieldBuilder() {
+        internalGetDefaultSessionConfigFieldBuilder() {
       if (defaultSessionConfigBuilder_ == null) {
         defaultSessionConfigBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.ConfigProto, org.tensorflow.proto.ConfigProto.Builder, org.tensorflow.proto.ConfigProtoOrBuilder>(
@@ -1620,7 +1621,7 @@ public Builder clearClusterDeviceFilters() {
     public org.tensorflow.proto.ClusterDeviceFilters.Builder getClusterDeviceFiltersBuilder() {
       bitField0_ |= 0x00000080;
       onChanged();
-      return getClusterDeviceFiltersFieldBuilder().getBuilder();
+      return internalGetClusterDeviceFiltersFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1648,7 +1649,7 @@ public org.tensorflow.proto.ClusterDeviceFiltersOrBuilder getClusterDeviceFilter
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.ClusterDeviceFilters, org.tensorflow.proto.ClusterDeviceFilters.Builder, org.tensorflow.proto.ClusterDeviceFiltersOrBuilder> 
-        getClusterDeviceFiltersFieldBuilder() {
+        internalGetClusterDeviceFiltersFieldBuilder() {
       if (clusterDeviceFiltersBuilder_ == null) {
         clusterDeviceFiltersBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.ClusterDeviceFilters, org.tensorflow.proto.ClusterDeviceFilters.Builder, org.tensorflow.proto.ClusterDeviceFiltersOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerDefOrBuilder.java
index b6f191e3c59..c0265dacefa 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/tensorflow_server.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ServerDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ServerDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerProtos.java
index 56fff5364e9..d196a7dd790 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ServerProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/tensorflow_server.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class ServerProtos {
   private ServerProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ServerProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionLog.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionLog.java
index 1bcf1d93e9a..66e91e3385b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionLog.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionLog.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.SessionLog}
  */
+@com.google.protobuf.Generated
 public final class SessionLog extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SessionLog)
@@ -21,8 +22,8 @@ public final class SessionLog extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SessionLog.class.getName());
   }
@@ -77,8 +78,8 @@ public enum SessionStatus
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SessionStatus.class.getName());
     }
@@ -156,7 +157,7 @@ public SessionStatus findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.SessionLog.getDescriptor().getEnumTypes().get(0);
     }
@@ -666,9 +667,7 @@ public org.tensorflow.proto.SessionLog.SessionStatus getStatus() {
      * @return This builder for chaining.
      */
     public Builder setStatus(org.tensorflow.proto.SessionLog.SessionStatus value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       status_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionLogOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionLogOrBuilder.java
index 1c97f0c82e8..95cc3cb40e1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionLogOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionLogOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SessionLogOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SessionLog)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionMetadata.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionMetadata.java
index 3031e8e58cb..af2bd937259 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionMetadata.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionMetadata.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -19,6 +19,7 @@
  *
  * Protobuf type {@code tensorflow.SessionMetadata}
  */
+@com.google.protobuf.Generated
 public final class SessionMetadata extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SessionMetadata)
@@ -28,8 +29,8 @@ public final class SessionMetadata extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SessionMetadata.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionMetadataOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionMetadataOrBuilder.java
index 2401495d7e2..e6e64d9984d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionMetadataOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SessionMetadataOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SessionMetadataOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SessionMetadata)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SignatureDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SignatureDef.java
index 6e0faf13917..3fd15f42a30 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SignatureDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SignatureDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.SignatureDef}
  */
+@com.google.protobuf.Generated
 public final class SignatureDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SignatureDef)
@@ -22,8 +23,8 @@ public final class SignatureDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SignatureDef.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SignatureDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SignatureDefOrBuilder.java
index 0e581154587..2b6c915b66f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SignatureDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SignatureDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SignatureDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SignatureDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceFile.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceFile.java
index ea02bfde086..96d4c6bde11 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceFile.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceFile.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.SourceFile}
  */
+@com.google.protobuf.Generated
 public final class SourceFile extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SourceFile)
@@ -22,8 +23,8 @@ public final class SourceFile extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SourceFile.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceFileOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceFileOrBuilder.java
index b4ba2c5003a..eedf018ca17 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceFileOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceFileOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SourceFileOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SourceFile)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceMetadata.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceMetadata.java
index 4ba484f32c5..01fd1cd7c07 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceMetadata.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceMetadata.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.SourceMetadata}
  */
+@com.google.protobuf.Generated
 public final class SourceMetadata extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SourceMetadata)
@@ -21,8 +22,8 @@ public final class SourceMetadata extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SourceMetadata.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceMetadataOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceMetadataOrBuilder.java
index 7517f9cb4b6..c4098278141 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceMetadataOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SourceMetadataOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SourceMetadataOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SourceMetadata)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StackFrameWithId.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StackFrameWithId.java
index cb50e0e9abd..143c28f4f06 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StackFrameWithId.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StackFrameWithId.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.StackFrameWithId}
  */
+@com.google.protobuf.Generated
 public final class StackFrameWithId extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.StackFrameWithId)
@@ -21,8 +22,8 @@ public final class StackFrameWithId extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       StackFrameWithId.class.getName());
   }
@@ -348,7 +349,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getFileLineColFieldBuilder();
+        internalGetFileLineColFieldBuilder();
       }
     }
     @java.lang.Override
@@ -460,7 +461,7 @@ public Builder mergeFrom(
             } // case 10
             case 18: {
               input.readMessage(
-                  getFileLineColFieldBuilder().getBuilder(),
+                  internalGetFileLineColFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -707,7 +708,7 @@ public Builder clearFileLineCol() {
     public org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder getFileLineColBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getFileLineColFieldBuilder().getBuilder();
+      return internalGetFileLineColFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -737,7 +738,7 @@ public org.tensorflow.proto.GraphDebugInfo.FileLineColOrBuilder getFileLineColOr
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.GraphDebugInfo.FileLineCol, org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder, org.tensorflow.proto.GraphDebugInfo.FileLineColOrBuilder> 
-        getFileLineColFieldBuilder() {
+        internalGetFileLineColFieldBuilder() {
       if (fileLineColBuilder_ == null) {
         fileLineColBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.GraphDebugInfo.FileLineCol, org.tensorflow.proto.GraphDebugInfo.FileLineCol.Builder, org.tensorflow.proto.GraphDebugInfo.FileLineColOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StackFrameWithIdOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StackFrameWithIdOrBuilder.java
index a75ee48a314..604e49cf7dc 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StackFrameWithIdOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StackFrameWithIdOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface StackFrameWithIdOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.StackFrameWithId)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Status.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Status.java
index 39e89e7969d..3eb5602e79c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Status.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Status.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/status.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class Status {
   private Status() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Status.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StatusProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StatusProto.java
index 43cb0aec28b..590608f8c3d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StatusProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StatusProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/status.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.StatusProto}
  */
+@com.google.protobuf.Generated
 public final class StatusProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.StatusProto)
@@ -22,8 +23,8 @@ public final class StatusProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       StatusProto.class.getName());
   }
@@ -667,9 +668,7 @@ public org.tensorflow.proto.error.Code getCode() {
      * @return This builder for chaining.
      */
     public Builder setCode(org.tensorflow.proto.error.Code value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       code_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StatusProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StatusProtoOrBuilder.java
index ca1ada631f8..63e08cd05b2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StatusProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StatusProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/status.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface StatusProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.StatusProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStats.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStats.java
index 2625199ba7b..0519ae8ff78 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStats.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStats.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.StepStats}
  */
+@com.google.protobuf.Generated
 public final class StepStats extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.StepStats)
@@ -17,8 +18,8 @@ public final class StepStats extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       StepStats.class.getName());
   }
@@ -364,7 +365,7 @@ public Builder mergeFrom(org.tensorflow.proto.StepStats other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             devStatsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getDevStatsFieldBuilder() : null;
+                 internalGetDevStatsFieldBuilder() : null;
           } else {
             devStatsBuilder_.addAllMessages(other.devStats_);
           }
@@ -606,7 +607,7 @@ public Builder removeDevStats(int index) {
      */
     public org.tensorflow.proto.DeviceStepStats.Builder getDevStatsBuilder(
         int index) {
-      return getDevStatsFieldBuilder().getBuilder(index);
+      return internalGetDevStatsFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.DeviceStepStats dev_stats = 1;
@@ -633,7 +634,7 @@ public org.tensorflow.proto.DeviceStepStatsOrBuilder getDevStatsOrBuilder(
      * repeated .tensorflow.DeviceStepStats dev_stats = 1;
      */
     public org.tensorflow.proto.DeviceStepStats.Builder addDevStatsBuilder() {
-      return getDevStatsFieldBuilder().addBuilder(
+      return internalGetDevStatsFieldBuilder().addBuilder(
           org.tensorflow.proto.DeviceStepStats.getDefaultInstance());
     }
     /**
@@ -641,7 +642,7 @@ public org.tensorflow.proto.DeviceStepStats.Builder addDevStatsBuilder() {
      */
     public org.tensorflow.proto.DeviceStepStats.Builder addDevStatsBuilder(
         int index) {
-      return getDevStatsFieldBuilder().addBuilder(
+      return internalGetDevStatsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.DeviceStepStats.getDefaultInstance());
     }
     /**
@@ -649,11 +650,11 @@ public org.tensorflow.proto.DeviceStepStats.Builder addDevStatsBuilder(
      */
     public java.util.List 
          getDevStatsBuilderList() {
-      return getDevStatsFieldBuilder().getBuilderList();
+      return internalGetDevStatsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.DeviceStepStats, org.tensorflow.proto.DeviceStepStats.Builder, org.tensorflow.proto.DeviceStepStatsOrBuilder> 
-        getDevStatsFieldBuilder() {
+        internalGetDevStatsFieldBuilder() {
       if (devStatsBuilder_ == null) {
         devStatsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.DeviceStepStats, org.tensorflow.proto.DeviceStepStats.Builder, org.tensorflow.proto.DeviceStepStatsOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStatsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStatsOrBuilder.java
index 3accebd26e9..dacdc84a7d2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStatsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStatsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface StepStatsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.StepStats)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStatsProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStatsProtos.java
index 859a9f24f42..adad8e326fc 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStatsProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/StepStatsProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/step_stats.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class StepStatsProtos {
   private StepStatsProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       StepStatsProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Struct.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Struct.java
index 4c87522127d..7a9688c7f99 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Struct.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Struct.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/struct.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class Struct {
   private Struct() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Struct.class.getName());
   }
@@ -498,8 +499,8 @@ public static final class StructuredValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         StructuredValue.class.getName());
     }
@@ -1973,7 +1974,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getNoneValueFieldBuilder().getBuilder(),
+                    internalGetNoneValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 1;
                 break;
@@ -2001,7 +2002,7 @@ public Builder mergeFrom(
               } // case 112
               case 250: {
                 input.readMessage(
-                    getTensorShapeValueFieldBuilder().getBuilder(),
+                    internalGetTensorShapeValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 31;
                 break;
@@ -2014,63 +2015,63 @@ public Builder mergeFrom(
               } // case 256
               case 266: {
                 input.readMessage(
-                    getTensorSpecValueFieldBuilder().getBuilder(),
+                    internalGetTensorSpecValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 33;
                 break;
               } // case 266
               case 274: {
                 input.readMessage(
-                    getTypeSpecValueFieldBuilder().getBuilder(),
+                    internalGetTypeSpecValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 34;
                 break;
               } // case 274
               case 282: {
                 input.readMessage(
-                    getBoundedTensorSpecValueFieldBuilder().getBuilder(),
+                    internalGetBoundedTensorSpecValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 35;
                 break;
               } // case 282
               case 410: {
                 input.readMessage(
-                    getListValueFieldBuilder().getBuilder(),
+                    internalGetListValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 51;
                 break;
               } // case 410
               case 418: {
                 input.readMessage(
-                    getTupleValueFieldBuilder().getBuilder(),
+                    internalGetTupleValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 52;
                 break;
               } // case 418
               case 426: {
                 input.readMessage(
-                    getDictValueFieldBuilder().getBuilder(),
+                    internalGetDictValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 53;
                 break;
               } // case 426
               case 434: {
                 input.readMessage(
-                    getNamedTupleValueFieldBuilder().getBuilder(),
+                    internalGetNamedTupleValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 54;
                 break;
               } // case 434
               case 442: {
                 input.readMessage(
-                    getTensorValueFieldBuilder().getBuilder(),
+                    internalGetTensorValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 55;
                 break;
               } // case 442
               case 450: {
                 input.readMessage(
-                    getNumpyValueFieldBuilder().getBuilder(),
+                    internalGetNumpyValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 kindCase_ = 56;
                 break;
@@ -2239,7 +2240,7 @@ public Builder clearNoneValue() {
        * .tensorflow.NoneValue none_value = 1;
        */
       public org.tensorflow.proto.Struct.NoneValue.Builder getNoneValueBuilder() {
-        return getNoneValueFieldBuilder().getBuilder();
+        return internalGetNoneValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -2268,7 +2269,7 @@ public org.tensorflow.proto.Struct.NoneValueOrBuilder getNoneValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.NoneValue, org.tensorflow.proto.Struct.NoneValue.Builder, org.tensorflow.proto.Struct.NoneValueOrBuilder> 
-          getNoneValueFieldBuilder() {
+          internalGetNoneValueFieldBuilder() {
         if (noneValueBuilder_ == null) {
           if (!(kindCase_ == 1)) {
             kind_ = org.tensorflow.proto.Struct.NoneValue.getDefaultInstance();
@@ -2742,7 +2743,7 @@ public Builder clearTensorShapeValue() {
        * .tensorflow.TensorShapeProto tensor_shape_value = 31;
        */
       public org.tensorflow.proto.TensorShapeProto.Builder getTensorShapeValueBuilder() {
-        return getTensorShapeValueFieldBuilder().getBuilder();
+        return internalGetTensorShapeValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -2771,7 +2772,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getTensorShapeValueOrBuild
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getTensorShapeValueFieldBuilder() {
+          internalGetTensorShapeValueFieldBuilder() {
         if (tensorShapeValueBuilder_ == null) {
           if (!(kindCase_ == 31)) {
             kind_ = org.tensorflow.proto.TensorShapeProto.getDefaultInstance();
@@ -2857,9 +2858,7 @@ public org.tensorflow.proto.DataType getTensorDtypeValue() {
        * @return This builder for chaining.
        */
       public Builder setTensorDtypeValue(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         kindCase_ = 32;
         kind_ = value.getNumber();
         onChanged();
@@ -3014,7 +3013,7 @@ public Builder clearTensorSpecValue() {
        * .tensorflow.TensorSpecProto tensor_spec_value = 33;
        */
       public org.tensorflow.proto.Struct.TensorSpecProto.Builder getTensorSpecValueBuilder() {
-        return getTensorSpecValueFieldBuilder().getBuilder();
+        return internalGetTensorSpecValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3043,7 +3042,7 @@ public org.tensorflow.proto.Struct.TensorSpecProtoOrBuilder getTensorSpecValueOr
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.TensorSpecProto, org.tensorflow.proto.Struct.TensorSpecProto.Builder, org.tensorflow.proto.Struct.TensorSpecProtoOrBuilder> 
-          getTensorSpecValueFieldBuilder() {
+          internalGetTensorSpecValueFieldBuilder() {
         if (tensorSpecValueBuilder_ == null) {
           if (!(kindCase_ == 33)) {
             kind_ = org.tensorflow.proto.Struct.TensorSpecProto.getDefaultInstance();
@@ -3192,7 +3191,7 @@ public Builder clearTypeSpecValue() {
        * .tensorflow.TypeSpecProto type_spec_value = 34;
        */
       public org.tensorflow.proto.Struct.TypeSpecProto.Builder getTypeSpecValueBuilder() {
-        return getTypeSpecValueFieldBuilder().getBuilder();
+        return internalGetTypeSpecValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3221,7 +3220,7 @@ public org.tensorflow.proto.Struct.TypeSpecProtoOrBuilder getTypeSpecValueOrBuil
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.TypeSpecProto, org.tensorflow.proto.Struct.TypeSpecProto.Builder, org.tensorflow.proto.Struct.TypeSpecProtoOrBuilder> 
-          getTypeSpecValueFieldBuilder() {
+          internalGetTypeSpecValueFieldBuilder() {
         if (typeSpecValueBuilder_ == null) {
           if (!(kindCase_ == 34)) {
             kind_ = org.tensorflow.proto.Struct.TypeSpecProto.getDefaultInstance();
@@ -3370,7 +3369,7 @@ public Builder clearBoundedTensorSpecValue() {
        * .tensorflow.BoundedTensorSpecProto bounded_tensor_spec_value = 35;
        */
       public org.tensorflow.proto.Struct.BoundedTensorSpecProto.Builder getBoundedTensorSpecValueBuilder() {
-        return getBoundedTensorSpecValueFieldBuilder().getBuilder();
+        return internalGetBoundedTensorSpecValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3399,7 +3398,7 @@ public org.tensorflow.proto.Struct.BoundedTensorSpecProtoOrBuilder getBoundedTen
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.BoundedTensorSpecProto, org.tensorflow.proto.Struct.BoundedTensorSpecProto.Builder, org.tensorflow.proto.Struct.BoundedTensorSpecProtoOrBuilder> 
-          getBoundedTensorSpecValueFieldBuilder() {
+          internalGetBoundedTensorSpecValueFieldBuilder() {
         if (boundedTensorSpecValueBuilder_ == null) {
           if (!(kindCase_ == 35)) {
             kind_ = org.tensorflow.proto.Struct.BoundedTensorSpecProto.getDefaultInstance();
@@ -3548,7 +3547,7 @@ public Builder clearListValue() {
        * .tensorflow.ListValue list_value = 51;
        */
       public org.tensorflow.proto.Struct.ListValue.Builder getListValueBuilder() {
-        return getListValueFieldBuilder().getBuilder();
+        return internalGetListValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3577,7 +3576,7 @@ public org.tensorflow.proto.Struct.ListValueOrBuilder getListValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.ListValue, org.tensorflow.proto.Struct.ListValue.Builder, org.tensorflow.proto.Struct.ListValueOrBuilder> 
-          getListValueFieldBuilder() {
+          internalGetListValueFieldBuilder() {
         if (listValueBuilder_ == null) {
           if (!(kindCase_ == 51)) {
             kind_ = org.tensorflow.proto.Struct.ListValue.getDefaultInstance();
@@ -3726,7 +3725,7 @@ public Builder clearTupleValue() {
        * .tensorflow.TupleValue tuple_value = 52;
        */
       public org.tensorflow.proto.Struct.TupleValue.Builder getTupleValueBuilder() {
-        return getTupleValueFieldBuilder().getBuilder();
+        return internalGetTupleValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3755,7 +3754,7 @@ public org.tensorflow.proto.Struct.TupleValueOrBuilder getTupleValueOrBuilder()
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.TupleValue, org.tensorflow.proto.Struct.TupleValue.Builder, org.tensorflow.proto.Struct.TupleValueOrBuilder> 
-          getTupleValueFieldBuilder() {
+          internalGetTupleValueFieldBuilder() {
         if (tupleValueBuilder_ == null) {
           if (!(kindCase_ == 52)) {
             kind_ = org.tensorflow.proto.Struct.TupleValue.getDefaultInstance();
@@ -3904,7 +3903,7 @@ public Builder clearDictValue() {
        * .tensorflow.DictValue dict_value = 53;
        */
       public org.tensorflow.proto.Struct.DictValue.Builder getDictValueBuilder() {
-        return getDictValueFieldBuilder().getBuilder();
+        return internalGetDictValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3933,7 +3932,7 @@ public org.tensorflow.proto.Struct.DictValueOrBuilder getDictValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.DictValue, org.tensorflow.proto.Struct.DictValue.Builder, org.tensorflow.proto.Struct.DictValueOrBuilder> 
-          getDictValueFieldBuilder() {
+          internalGetDictValueFieldBuilder() {
         if (dictValueBuilder_ == null) {
           if (!(kindCase_ == 53)) {
             kind_ = org.tensorflow.proto.Struct.DictValue.getDefaultInstance();
@@ -4082,7 +4081,7 @@ public Builder clearNamedTupleValue() {
        * .tensorflow.NamedTupleValue named_tuple_value = 54;
        */
       public org.tensorflow.proto.Struct.NamedTupleValue.Builder getNamedTupleValueBuilder() {
-        return getNamedTupleValueFieldBuilder().getBuilder();
+        return internalGetNamedTupleValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -4111,7 +4110,7 @@ public org.tensorflow.proto.Struct.NamedTupleValueOrBuilder getNamedTupleValueOr
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.NamedTupleValue, org.tensorflow.proto.Struct.NamedTupleValue.Builder, org.tensorflow.proto.Struct.NamedTupleValueOrBuilder> 
-          getNamedTupleValueFieldBuilder() {
+          internalGetNamedTupleValueFieldBuilder() {
         if (namedTupleValueBuilder_ == null) {
           if (!(kindCase_ == 54)) {
             kind_ = org.tensorflow.proto.Struct.NamedTupleValue.getDefaultInstance();
@@ -4260,7 +4259,7 @@ public Builder clearTensorValue() {
        * .tensorflow.TensorProto tensor_value = 55;
        */
       public org.tensorflow.proto.TensorProto.Builder getTensorValueBuilder() {
-        return getTensorValueFieldBuilder().getBuilder();
+        return internalGetTensorValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -4289,7 +4288,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-          getTensorValueFieldBuilder() {
+          internalGetTensorValueFieldBuilder() {
         if (tensorValueBuilder_ == null) {
           if (!(kindCase_ == 55)) {
             kind_ = org.tensorflow.proto.TensorProto.getDefaultInstance();
@@ -4438,7 +4437,7 @@ public Builder clearNumpyValue() {
        * .tensorflow.TensorProto numpy_value = 56;
        */
       public org.tensorflow.proto.TensorProto.Builder getNumpyValueBuilder() {
-        return getNumpyValueFieldBuilder().getBuilder();
+        return internalGetNumpyValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -4467,7 +4466,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getNumpyValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-          getNumpyValueFieldBuilder() {
+          internalGetNumpyValueFieldBuilder() {
         if (numpyValueBuilder_ == null) {
           if (!(kindCase_ == 56)) {
             kind_ = org.tensorflow.proto.TensorProto.getDefaultInstance();
@@ -4555,8 +4554,8 @@ public static final class NoneValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NoneValue.class.getName());
     }
@@ -4942,8 +4941,8 @@ public static final class ListValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ListValue.class.getName());
     }
@@ -5293,7 +5292,7 @@ public Builder mergeFrom(org.tensorflow.proto.Struct.ListValue other) {
               bitField0_ = (bitField0_ & ~0x00000001);
               valuesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getValuesFieldBuilder() : null;
+                   internalGetValuesFieldBuilder() : null;
             } else {
               valuesBuilder_.addAllMessages(other.values_);
             }
@@ -5535,7 +5534,7 @@ public Builder removeValues(int index) {
        */
       public org.tensorflow.proto.Struct.StructuredValue.Builder getValuesBuilder(
           int index) {
-        return getValuesFieldBuilder().getBuilder(index);
+        return internalGetValuesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.StructuredValue values = 1;
@@ -5562,7 +5561,7 @@ public org.tensorflow.proto.Struct.StructuredValueOrBuilder getValuesOrBuilder(
        * repeated .tensorflow.StructuredValue values = 1;
        */
       public org.tensorflow.proto.Struct.StructuredValue.Builder addValuesBuilder() {
-        return getValuesFieldBuilder().addBuilder(
+        return internalGetValuesFieldBuilder().addBuilder(
             org.tensorflow.proto.Struct.StructuredValue.getDefaultInstance());
       }
       /**
@@ -5570,7 +5569,7 @@ public org.tensorflow.proto.Struct.StructuredValue.Builder addValuesBuilder() {
        */
       public org.tensorflow.proto.Struct.StructuredValue.Builder addValuesBuilder(
           int index) {
-        return getValuesFieldBuilder().addBuilder(
+        return internalGetValuesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.Struct.StructuredValue.getDefaultInstance());
       }
       /**
@@ -5578,11 +5577,11 @@ public org.tensorflow.proto.Struct.StructuredValue.Builder addValuesBuilder(
        */
       public java.util.List 
            getValuesBuilderList() {
-        return getValuesFieldBuilder().getBuilderList();
+        return internalGetValuesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder> 
-          getValuesFieldBuilder() {
+          internalGetValuesFieldBuilder() {
         if (valuesBuilder_ == null) {
           valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder>(
@@ -5690,8 +5689,8 @@ public static final class TupleValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TupleValue.class.getName());
     }
@@ -6041,7 +6040,7 @@ public Builder mergeFrom(org.tensorflow.proto.Struct.TupleValue other) {
               bitField0_ = (bitField0_ & ~0x00000001);
               valuesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getValuesFieldBuilder() : null;
+                   internalGetValuesFieldBuilder() : null;
             } else {
               valuesBuilder_.addAllMessages(other.values_);
             }
@@ -6283,7 +6282,7 @@ public Builder removeValues(int index) {
        */
       public org.tensorflow.proto.Struct.StructuredValue.Builder getValuesBuilder(
           int index) {
-        return getValuesFieldBuilder().getBuilder(index);
+        return internalGetValuesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.StructuredValue values = 1;
@@ -6310,7 +6309,7 @@ public org.tensorflow.proto.Struct.StructuredValueOrBuilder getValuesOrBuilder(
        * repeated .tensorflow.StructuredValue values = 1;
        */
       public org.tensorflow.proto.Struct.StructuredValue.Builder addValuesBuilder() {
-        return getValuesFieldBuilder().addBuilder(
+        return internalGetValuesFieldBuilder().addBuilder(
             org.tensorflow.proto.Struct.StructuredValue.getDefaultInstance());
       }
       /**
@@ -6318,7 +6317,7 @@ public org.tensorflow.proto.Struct.StructuredValue.Builder addValuesBuilder() {
        */
       public org.tensorflow.proto.Struct.StructuredValue.Builder addValuesBuilder(
           int index) {
-        return getValuesFieldBuilder().addBuilder(
+        return internalGetValuesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.Struct.StructuredValue.getDefaultInstance());
       }
       /**
@@ -6326,11 +6325,11 @@ public org.tensorflow.proto.Struct.StructuredValue.Builder addValuesBuilder(
        */
       public java.util.List 
            getValuesBuilderList() {
-        return getValuesFieldBuilder().getBuilderList();
+        return internalGetValuesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder> 
-          getValuesFieldBuilder() {
+          internalGetValuesFieldBuilder() {
         if (valuesBuilder_ == null) {
           valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder>(
@@ -6449,8 +6448,8 @@ public static final class DictValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DictValue.class.getName());
     }
@@ -7153,8 +7152,8 @@ public static final class PairValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         PairValue.class.getName());
     }
@@ -7454,7 +7453,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getValueFieldBuilder();
+          internalGetValueFieldBuilder();
         }
       }
       @java.lang.Override
@@ -7566,7 +7565,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getValueFieldBuilder().getBuilder(),
+                    internalGetValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -7751,7 +7750,7 @@ public Builder clearValue() {
       public org.tensorflow.proto.Struct.StructuredValue.Builder getValueBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getValueFieldBuilder().getBuilder();
+        return internalGetValueFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.StructuredValue value = 2;
@@ -7769,7 +7768,7 @@ public org.tensorflow.proto.Struct.StructuredValueOrBuilder getValueOrBuilder()
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder>(
@@ -7888,8 +7887,8 @@ public static final class NamedTupleValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NamedTupleValue.class.getName());
     }
@@ -8298,7 +8297,7 @@ public Builder mergeFrom(org.tensorflow.proto.Struct.NamedTupleValue other) {
               bitField0_ = (bitField0_ & ~0x00000002);
               valuesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getValuesFieldBuilder() : null;
+                   internalGetValuesFieldBuilder() : null;
             } else {
               valuesBuilder_.addAllMessages(other.values_);
             }
@@ -8617,7 +8616,7 @@ public Builder removeValues(int index) {
        */
       public org.tensorflow.proto.Struct.PairValue.Builder getValuesBuilder(
           int index) {
-        return getValuesFieldBuilder().getBuilder(index);
+        return internalGetValuesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.PairValue values = 2;
@@ -8644,7 +8643,7 @@ public org.tensorflow.proto.Struct.PairValueOrBuilder getValuesOrBuilder(
        * repeated .tensorflow.PairValue values = 2;
        */
       public org.tensorflow.proto.Struct.PairValue.Builder addValuesBuilder() {
-        return getValuesFieldBuilder().addBuilder(
+        return internalGetValuesFieldBuilder().addBuilder(
             org.tensorflow.proto.Struct.PairValue.getDefaultInstance());
       }
       /**
@@ -8652,7 +8651,7 @@ public org.tensorflow.proto.Struct.PairValue.Builder addValuesBuilder() {
        */
       public org.tensorflow.proto.Struct.PairValue.Builder addValuesBuilder(
           int index) {
-        return getValuesFieldBuilder().addBuilder(
+        return internalGetValuesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.Struct.PairValue.getDefaultInstance());
       }
       /**
@@ -8660,11 +8659,11 @@ public org.tensorflow.proto.Struct.PairValue.Builder addValuesBuilder(
        */
       public java.util.List 
            getValuesBuilderList() {
-        return getValuesFieldBuilder().getBuilderList();
+        return internalGetValuesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.Struct.PairValue, org.tensorflow.proto.Struct.PairValue.Builder, org.tensorflow.proto.Struct.PairValueOrBuilder> 
-          getValuesFieldBuilder() {
+          internalGetValuesFieldBuilder() {
         if (valuesBuilder_ == null) {
           valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.Struct.PairValue, org.tensorflow.proto.Struct.PairValue.Builder, org.tensorflow.proto.Struct.PairValueOrBuilder>(
@@ -8786,8 +8785,8 @@ public static final class TensorSpecProto extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TensorSpecProto.class.getName());
     }
@@ -9116,7 +9115,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getShapeFieldBuilder();
+          internalGetShapeFieldBuilder();
         }
       }
       @java.lang.Override
@@ -9235,7 +9234,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getShapeFieldBuilder().getBuilder(),
+                    internalGetShapeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -9425,7 +9424,7 @@ public Builder clearShape() {
       public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getShapeFieldBuilder().getBuilder();
+        return internalGetShapeFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TensorShapeProto shape = 2;
@@ -9443,7 +9442,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getShapeFieldBuilder() {
+          internalGetShapeFieldBuilder() {
         if (shapeBuilder_ == null) {
           shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -9489,9 +9488,7 @@ public org.tensorflow.proto.DataType getDtype() {
        * @return This builder for chaining.
        */
       public Builder setDtype(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000004;
         dtype_ = value.getNumber();
         onChanged();
@@ -9647,8 +9644,8 @@ public static final class BoundedTensorSpecProto extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         BoundedTensorSpecProto.class.getName());
     }
@@ -10061,9 +10058,9 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getShapeFieldBuilder();
-          getMinimumFieldBuilder();
-          getMaximumFieldBuilder();
+          internalGetShapeFieldBuilder();
+          internalGetMinimumFieldBuilder();
+          internalGetMaximumFieldBuilder();
         }
       }
       @java.lang.Override
@@ -10210,7 +10207,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getShapeFieldBuilder().getBuilder(),
+                    internalGetShapeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -10222,14 +10219,14 @@ public Builder mergeFrom(
               } // case 24
               case 34: {
                 input.readMessage(
-                    getMinimumFieldBuilder().getBuilder(),
+                    internalGetMinimumFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000008;
                 break;
               } // case 34
               case 42: {
                 input.readMessage(
-                    getMaximumFieldBuilder().getBuilder(),
+                    internalGetMaximumFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000010;
                 break;
@@ -10414,7 +10411,7 @@ public Builder clearShape() {
       public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getShapeFieldBuilder().getBuilder();
+        return internalGetShapeFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TensorShapeProto shape = 2;
@@ -10432,7 +10429,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getShapeFieldBuilder() {
+          internalGetShapeFieldBuilder() {
         if (shapeBuilder_ == null) {
           shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -10478,9 +10475,7 @@ public org.tensorflow.proto.DataType getDtype() {
        * @return This builder for chaining.
        */
       public Builder setDtype(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000004;
         dtype_ = value.getNumber();
         onChanged();
@@ -10588,7 +10583,7 @@ public Builder clearMinimum() {
       public org.tensorflow.proto.TensorProto.Builder getMinimumBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
-        return getMinimumFieldBuilder().getBuilder();
+        return internalGetMinimumFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TensorProto minimum = 4;
@@ -10606,7 +10601,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getMinimumOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-          getMinimumFieldBuilder() {
+          internalGetMinimumFieldBuilder() {
         if (minimumBuilder_ == null) {
           minimumBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
@@ -10709,7 +10704,7 @@ public Builder clearMaximum() {
       public org.tensorflow.proto.TensorProto.Builder getMaximumBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
-        return getMaximumFieldBuilder().getBuilder();
+        return internalGetMaximumFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TensorProto maximum = 5;
@@ -10727,7 +10722,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getMaximumOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-          getMaximumFieldBuilder() {
+          internalGetMaximumFieldBuilder() {
         if (maximumBuilder_ == null) {
           maximumBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
@@ -10892,8 +10887,8 @@ public static final class TypeSpecProto extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TypeSpecProto.class.getName());
     }
@@ -11031,8 +11026,8 @@ public enum TypeSpecClass
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           TypeSpecClass.class.getName());
       }
@@ -11203,7 +11198,7 @@ public TypeSpecClass findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.Struct.TypeSpecProto.getDescriptor().getEnumTypes().get(0);
       }
@@ -11594,7 +11589,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getTypeStateFieldBuilder();
+          internalGetTypeStateFieldBuilder();
         }
       }
       @java.lang.Override
@@ -11720,7 +11715,7 @@ public Builder mergeFrom(
               } // case 8
               case 18: {
                 input.readMessage(
-                    getTypeStateFieldBuilder().getBuilder(),
+                    internalGetTypeStateFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -11786,9 +11781,7 @@ public org.tensorflow.proto.Struct.TypeSpecProto.TypeSpecClass getTypeSpecClass(
        * @return This builder for chaining.
        */
       public Builder setTypeSpecClass(org.tensorflow.proto.Struct.TypeSpecProto.TypeSpecClass value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         typeSpecClass_ = value.getNumber();
         onChanged();
@@ -11924,7 +11917,7 @@ public Builder clearTypeState() {
       public org.tensorflow.proto.Struct.StructuredValue.Builder getTypeStateBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getTypeStateFieldBuilder().getBuilder();
+        return internalGetTypeStateFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -11950,7 +11943,7 @@ public org.tensorflow.proto.Struct.StructuredValueOrBuilder getTypeStateOrBuilde
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder> 
-          getTypeStateFieldBuilder() {
+          internalGetTypeStateFieldBuilder() {
         if (typeStateBuilder_ == null) {
           typeStateBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.Struct.StructuredValue, org.tensorflow.proto.Struct.StructuredValue.Builder, org.tensorflow.proto.Struct.StructuredValueOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Summary.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Summary.java
index ee1bb65c4cd..9724d988908 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Summary.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/Summary.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/summary.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -17,6 +17,7 @@
  *
  * Protobuf type {@code tensorflow.Summary}
  */
+@com.google.protobuf.Generated
 public final class Summary extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.Summary)
@@ -26,8 +27,8 @@ public final class Summary extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Summary.class.getName());
   }
@@ -111,8 +112,8 @@ public static final class Image extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Image.class.getName());
     }
@@ -496,7 +497,7 @@ public Builder mergeFrom(org.tensorflow.proto.Summary.Image other) {
         if (other.getColorspace() != 0) {
           setColorspace(other.getColorspace());
         }
-        if (other.getEncodedImageString() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getEncodedImageString().isEmpty()) {
           setEncodedImageString(other.getEncodedImageString());
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -867,8 +868,8 @@ public static final class Audio extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Audio.class.getName());
     }
@@ -1299,7 +1300,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(org.tensorflow.proto.Summary.Audio other) {
         if (other == org.tensorflow.proto.Summary.Audio.getDefaultInstance()) return this;
-        if (other.getSampleRate() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getSampleRate()) != 0) {
           setSampleRate(other.getSampleRate());
         }
         if (other.getNumChannels() != 0L) {
@@ -1308,7 +1309,7 @@ public Builder mergeFrom(org.tensorflow.proto.Summary.Audio other) {
         if (other.getLengthFrames() != 0L) {
           setLengthFrames(other.getLengthFrames());
         }
-        if (other.getEncodedAudioString() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getEncodedAudioString().isEmpty()) {
           setEncodedAudioString(other.getEncodedAudioString());
         }
         if (!other.getContentType().isEmpty()) {
@@ -1869,8 +1870,8 @@ public static final class Value extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Value.class.getName());
     }
@@ -2581,7 +2582,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getMetadataFieldBuilder();
+          internalGetMetadataFieldBuilder();
         }
       }
       @java.lang.Override
@@ -2777,21 +2778,21 @@ public Builder mergeFrom(
               } // case 26
               case 34: {
                 input.readMessage(
-                    getImageFieldBuilder().getBuilder(),
+                    internalGetImageFieldBuilder().getBuilder(),
                     extensionRegistry);
                 valueCase_ = 4;
                 break;
               } // case 34
               case 42: {
                 input.readMessage(
-                    getHistoFieldBuilder().getBuilder(),
+                    internalGetHistoFieldBuilder().getBuilder(),
                     extensionRegistry);
                 valueCase_ = 5;
                 break;
               } // case 42
               case 50: {
                 input.readMessage(
-                    getAudioFieldBuilder().getBuilder(),
+                    internalGetAudioFieldBuilder().getBuilder(),
                     extensionRegistry);
                 valueCase_ = 6;
                 break;
@@ -2803,14 +2804,14 @@ public Builder mergeFrom(
               } // case 58
               case 66: {
                 input.readMessage(
-                    getTensorFieldBuilder().getBuilder(),
+                    internalGetTensorFieldBuilder().getBuilder(),
                     extensionRegistry);
                 valueCase_ = 8;
                 break;
               } // case 66
               case 74: {
                 input.readMessage(
-                    getMetadataFieldBuilder().getBuilder(),
+                    internalGetMetadataFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -3188,7 +3189,7 @@ public Builder clearMetadata() {
       public org.tensorflow.proto.SummaryMetadata.Builder getMetadataBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getMetadataFieldBuilder().getBuilder();
+        return internalGetMetadataFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -3222,7 +3223,7 @@ public org.tensorflow.proto.SummaryMetadataOrBuilder getMetadataOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.SummaryMetadata, org.tensorflow.proto.SummaryMetadata.Builder, org.tensorflow.proto.SummaryMetadataOrBuilder> 
-          getMetadataFieldBuilder() {
+          internalGetMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.SummaryMetadata, org.tensorflow.proto.SummaryMetadata.Builder, org.tensorflow.proto.SummaryMetadataOrBuilder>(
@@ -3422,7 +3423,7 @@ public Builder clearImage() {
        * .tensorflow.Summary.Image image = 4;
        */
       public org.tensorflow.proto.Summary.Image.Builder getImageBuilder() {
-        return getImageFieldBuilder().getBuilder();
+        return internalGetImageFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.Summary.Image image = 4;
@@ -3443,7 +3444,7 @@ public org.tensorflow.proto.Summary.ImageOrBuilder getImageOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Summary.Image, org.tensorflow.proto.Summary.Image.Builder, org.tensorflow.proto.Summary.ImageOrBuilder> 
-          getImageFieldBuilder() {
+          internalGetImageFieldBuilder() {
         if (imageBuilder_ == null) {
           if (!(valueCase_ == 4)) {
             value_ = org.tensorflow.proto.Summary.Image.getDefaultInstance();
@@ -3564,7 +3565,7 @@ public Builder clearHisto() {
        * .tensorflow.HistogramProto histo = 5;
        */
       public org.tensorflow.proto.HistogramProto.Builder getHistoBuilder() {
-        return getHistoFieldBuilder().getBuilder();
+        return internalGetHistoFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.HistogramProto histo = 5;
@@ -3585,7 +3586,7 @@ public org.tensorflow.proto.HistogramProtoOrBuilder getHistoOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.HistogramProto, org.tensorflow.proto.HistogramProto.Builder, org.tensorflow.proto.HistogramProtoOrBuilder> 
-          getHistoFieldBuilder() {
+          internalGetHistoFieldBuilder() {
         if (histoBuilder_ == null) {
           if (!(valueCase_ == 5)) {
             value_ = org.tensorflow.proto.HistogramProto.getDefaultInstance();
@@ -3706,7 +3707,7 @@ public Builder clearAudio() {
        * .tensorflow.Summary.Audio audio = 6;
        */
       public org.tensorflow.proto.Summary.Audio.Builder getAudioBuilder() {
-        return getAudioFieldBuilder().getBuilder();
+        return internalGetAudioFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.Summary.Audio audio = 6;
@@ -3727,7 +3728,7 @@ public org.tensorflow.proto.Summary.AudioOrBuilder getAudioOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Summary.Audio, org.tensorflow.proto.Summary.Audio.Builder, org.tensorflow.proto.Summary.AudioOrBuilder> 
-          getAudioFieldBuilder() {
+          internalGetAudioFieldBuilder() {
         if (audioBuilder_ == null) {
           if (!(valueCase_ == 6)) {
             value_ = org.tensorflow.proto.Summary.Audio.getDefaultInstance();
@@ -3848,7 +3849,7 @@ public Builder clearTensor() {
        * .tensorflow.TensorProto tensor = 8;
        */
       public org.tensorflow.proto.TensorProto.Builder getTensorBuilder() {
-        return getTensorFieldBuilder().getBuilder();
+        return internalGetTensorFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TensorProto tensor = 8;
@@ -3869,7 +3870,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-          getTensorFieldBuilder() {
+          internalGetTensorFieldBuilder() {
         if (tensorBuilder_ == null) {
           if (!(valueCase_ == 8)) {
             value_ = org.tensorflow.proto.TensorProto.getDefaultInstance();
@@ -4287,7 +4288,7 @@ public Builder mergeFrom(org.tensorflow.proto.Summary other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             valueBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getValueFieldBuilder() : null;
+                 internalGetValueFieldBuilder() : null;
           } else {
             valueBuilder_.addAllMessages(other.value_);
           }
@@ -4581,7 +4582,7 @@ public Builder removeValue(int index) {
      */
     public org.tensorflow.proto.Summary.Value.Builder getValueBuilder(
         int index) {
-      return getValueFieldBuilder().getBuilder(index);
+      return internalGetValueFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -4620,7 +4621,7 @@ public org.tensorflow.proto.Summary.ValueOrBuilder getValueOrBuilder(
      * repeated .tensorflow.Summary.Value value = 1;
      */
     public org.tensorflow.proto.Summary.Value.Builder addValueBuilder() {
-      return getValueFieldBuilder().addBuilder(
+      return internalGetValueFieldBuilder().addBuilder(
           org.tensorflow.proto.Summary.Value.getDefaultInstance());
     }
     /**
@@ -4632,7 +4633,7 @@ public org.tensorflow.proto.Summary.Value.Builder addValueBuilder() {
      */
     public org.tensorflow.proto.Summary.Value.Builder addValueBuilder(
         int index) {
-      return getValueFieldBuilder().addBuilder(
+      return internalGetValueFieldBuilder().addBuilder(
           index, org.tensorflow.proto.Summary.Value.getDefaultInstance());
     }
     /**
@@ -4644,11 +4645,11 @@ public org.tensorflow.proto.Summary.Value.Builder addValueBuilder(
      */
     public java.util.List 
          getValueBuilderList() {
-      return getValueFieldBuilder().getBuilderList();
+      return internalGetValueFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.Summary.Value, org.tensorflow.proto.Summary.Value.Builder, org.tensorflow.proto.Summary.ValueOrBuilder> 
-        getValueFieldBuilder() {
+        internalGetValueFieldBuilder() {
       if (valueBuilder_ == null) {
         valueBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.Summary.Value, org.tensorflow.proto.Summary.Value.Builder, org.tensorflow.proto.Summary.ValueOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryDescription.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryDescription.java
index 40843246261..f841b7e29ba 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryDescription.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryDescription.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/summary.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.SummaryDescription}
  */
+@com.google.protobuf.Generated
 public final class SummaryDescription extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SummaryDescription)
@@ -21,8 +22,8 @@ public final class SummaryDescription extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SummaryDescription.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryDescriptionOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryDescriptionOrBuilder.java
index d1b59f7cd9c..e15762efbc6 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryDescriptionOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryDescriptionOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/summary.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SummaryDescriptionOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SummaryDescription)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryMetadata.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryMetadata.java
index 5991e77f41c..866b4f4be63 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryMetadata.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryMetadata.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/summary.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf type {@code tensorflow.SummaryMetadata}
  */
+@com.google.protobuf.Generated
 public final class SummaryMetadata extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.SummaryMetadata)
@@ -22,8 +23,8 @@ public final class SummaryMetadata extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SummaryMetadata.class.getName());
   }
@@ -97,8 +98,8 @@ public static final class PluginData extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         PluginData.class.getName());
     }
@@ -448,7 +449,7 @@ public Builder mergeFrom(org.tensorflow.proto.SummaryMetadata.PluginData other)
           bitField0_ |= 0x00000001;
           onChanged();
         }
-        if (other.getContent() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getContent().isEmpty()) {
           setContent(other.getContent());
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -1089,7 +1090,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getPluginDataFieldBuilder();
+        internalGetPluginDataFieldBuilder();
       }
     }
     @java.lang.Override
@@ -1212,7 +1213,7 @@ public Builder mergeFrom(
               break;
             case 10: {
               input.readMessage(
-                  getPluginDataFieldBuilder().getBuilder(),
+                  internalGetPluginDataFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000001;
               break;
@@ -1368,7 +1369,7 @@ public Builder clearPluginData() {
     public org.tensorflow.proto.SummaryMetadata.PluginData.Builder getPluginDataBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
-      return getPluginDataFieldBuilder().getBuilder();
+      return internalGetPluginDataFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1394,7 +1395,7 @@ public org.tensorflow.proto.SummaryMetadata.PluginDataOrBuilder getPluginDataOrB
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SummaryMetadata.PluginData, org.tensorflow.proto.SummaryMetadata.PluginData.Builder, org.tensorflow.proto.SummaryMetadata.PluginDataOrBuilder> 
-        getPluginDataFieldBuilder() {
+        internalGetPluginDataFieldBuilder() {
       if (pluginDataBuilder_ == null) {
         pluginDataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.SummaryMetadata.PluginData, org.tensorflow.proto.SummaryMetadata.PluginData.Builder, org.tensorflow.proto.SummaryMetadata.PluginDataOrBuilder>(
@@ -1652,9 +1653,7 @@ public org.tensorflow.proto.DataClass getDataClass() {
      * @return This builder for chaining.
      */
     public Builder setDataClass(org.tensorflow.proto.DataClass value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000008;
       dataClass_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryMetadataOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryMetadataOrBuilder.java
index a7c7adb8253..607e819d618 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryMetadataOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryMetadataOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/summary.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SummaryMetadataOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.SummaryMetadata)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryOrBuilder.java
index 1477e151a96..eec7ed6ed7a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/summary.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface SummaryOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.Summary)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryProtos.java
index 17ee633adc7..44216fcace2 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/SummaryProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/summary.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class SummaryProtos {
   private SummaryProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SummaryProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaggedRunMetadata.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaggedRunMetadata.java
index 8fabbf0cbcf..4b7779b12c3 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaggedRunMetadata.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaggedRunMetadata.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.TaggedRunMetadata}
  */
+@com.google.protobuf.Generated
 public final class TaggedRunMetadata extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TaggedRunMetadata)
@@ -21,8 +22,8 @@ public final class TaggedRunMetadata extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TaggedRunMetadata.class.getName());
   }
@@ -376,7 +377,7 @@ public Builder mergeFrom(org.tensorflow.proto.TaggedRunMetadata other) {
         bitField0_ |= 0x00000001;
         onChanged();
       }
-      if (other.getRunMetadata() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getRunMetadata().isEmpty()) {
         setRunMetadata(other.getRunMetadata());
       }
       this.mergeUnknownFields(other.getUnknownFields());
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaggedRunMetadataOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaggedRunMetadataOrBuilder.java
index a1b394e2b14..5a1bc45999d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaggedRunMetadataOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaggedRunMetadataOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TaggedRunMetadataOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TaggedRunMetadata)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaskDeviceFilters.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaskDeviceFilters.java
index cb5547127cc..9d8a5cde47a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaskDeviceFilters.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaskDeviceFilters.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/device_filters.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.TaskDeviceFilters}
  */
+@com.google.protobuf.Generated
 public final class TaskDeviceFilters extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TaskDeviceFilters)
@@ -21,8 +22,8 @@ public final class TaskDeviceFilters extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TaskDeviceFilters.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaskDeviceFiltersOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaskDeviceFiltersOrBuilder.java
index abc76e76f7a..c8cbe95c73b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaskDeviceFiltersOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TaskDeviceFiltersOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/device_filters.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TaskDeviceFiltersOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TaskDeviceFilters)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorBundleProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorBundleProtos.java
index ccdfaa8353b..69107ae67cf 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorBundleProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorBundleProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/tensor_bundle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TensorBundleProtos {
   private TensorBundleProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorBundleProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorConnection.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorConnection.java
index 56f3100ea90..a3c2601eea5 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorConnection.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorConnection.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.TensorConnection}
  */
+@com.google.protobuf.Generated
 public final class TensorConnection extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TensorConnection)
@@ -21,8 +22,8 @@ public final class TensorConnection extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorConnection.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorConnectionOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorConnectionOrBuilder.java
index a13b5780996..2bc0005ad60 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorConnectionOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorConnectionOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TensorConnectionOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TensorConnection)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDebugMode.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDebugMode.java
index 982460ab7de..026d3c5b8d1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDebugMode.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDebugMode.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/debug_event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -14,6 +14,7 @@
  *
  * Protobuf enum {@code tensorflow.TensorDebugMode}
  */
+@com.google.protobuf.Generated
 public enum TensorDebugMode
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -114,8 +115,8 @@ public enum TensorDebugMode
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorDebugMode.class.getName());
   }
@@ -273,7 +274,7 @@ public TensorDebugMode findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.DebugEventProtos.getDescriptor().getEnumTypes().get(0);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescription.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescription.java
index b91793b6788..19200f6fa59 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescription.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescription.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_description.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.TensorDescription}
  */
+@com.google.protobuf.Generated
 public final class TensorDescription extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TensorDescription)
@@ -17,8 +18,8 @@ public final class TensorDescription extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorDescription.class.getName());
   }
@@ -367,8 +368,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getShapeFieldBuilder();
-        getAllocationDescriptionFieldBuilder();
+        internalGetShapeFieldBuilder();
+        internalGetAllocationDescriptionFieldBuilder();
       }
     }
     @java.lang.Override
@@ -492,14 +493,14 @@ public Builder mergeFrom(
             } // case 8
             case 18: {
               input.readMessage(
-                  getShapeFieldBuilder().getBuilder(),
+                  internalGetShapeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
             } // case 18
             case 34: {
               input.readMessage(
-                  getAllocationDescriptionFieldBuilder().getBuilder(),
+                  internalGetAllocationDescriptionFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
@@ -571,9 +572,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       dtype_ = value.getNumber();
       onChanged();
@@ -713,7 +712,7 @@ public Builder clearShape() {
     public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getShapeFieldBuilder().getBuilder();
+      return internalGetShapeFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -739,7 +738,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-        getShapeFieldBuilder() {
+        internalGetShapeFieldBuilder() {
       if (shapeBuilder_ == null) {
         shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -870,7 +869,7 @@ public Builder clearAllocationDescription() {
     public org.tensorflow.proto.AllocationDescription.Builder getAllocationDescriptionBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getAllocationDescriptionFieldBuilder().getBuilder();
+      return internalGetAllocationDescriptionFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -896,7 +895,7 @@ public org.tensorflow.proto.AllocationDescriptionOrBuilder getAllocationDescript
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.AllocationDescription, org.tensorflow.proto.AllocationDescription.Builder, org.tensorflow.proto.AllocationDescriptionOrBuilder> 
-        getAllocationDescriptionFieldBuilder() {
+        internalGetAllocationDescriptionFieldBuilder() {
       if (allocationDescriptionBuilder_ == null) {
         allocationDescriptionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.AllocationDescription, org.tensorflow.proto.AllocationDescription.Builder, org.tensorflow.proto.AllocationDescriptionOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescriptionOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescriptionOrBuilder.java
index 42e8478aab8..9f726e14878 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescriptionOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescriptionOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_description.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TensorDescriptionOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TensorDescription)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescriptionProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescriptionProtos.java
index 52dfca9d9b3..9352abdb810 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescriptionProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorDescriptionProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_description.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TensorDescriptionProtos {
   private TensorDescriptionProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorDescriptionProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorInfo.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorInfo.java
index 1c2f1251ff7..a84a8c04c42 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorInfo.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorInfo.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.TensorInfo}
  */
+@com.google.protobuf.Generated
 public final class TensorInfo extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TensorInfo)
@@ -21,8 +22,8 @@ public final class TensorInfo extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorInfo.class.getName());
   }
@@ -132,8 +133,8 @@ public static final class CooSparse extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CooSparse.class.getName());
     }
@@ -1080,8 +1081,8 @@ public static final class CompositeTensor extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CompositeTensor.class.getName());
     }
@@ -1418,8 +1419,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getTypeSpecFieldBuilder();
-          getComponentsFieldBuilder();
+          internalGetTypeSpecFieldBuilder();
+          internalGetComponentsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -1529,7 +1530,7 @@ public Builder mergeFrom(org.tensorflow.proto.TensorInfo.CompositeTensor other)
               bitField0_ = (bitField0_ & ~0x00000002);
               componentsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getComponentsFieldBuilder() : null;
+                   internalGetComponentsFieldBuilder() : null;
             } else {
               componentsBuilder_.addAllMessages(other.components_);
             }
@@ -1563,7 +1564,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getTypeSpecFieldBuilder().getBuilder(),
+                    internalGetTypeSpecFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -1717,7 +1718,7 @@ public Builder clearTypeSpec() {
       public org.tensorflow.proto.Struct.TypeSpecProto.Builder getTypeSpecBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getTypeSpecFieldBuilder().getBuilder();
+        return internalGetTypeSpecFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -1743,7 +1744,7 @@ public org.tensorflow.proto.Struct.TypeSpecProtoOrBuilder getTypeSpecOrBuilder()
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.Struct.TypeSpecProto, org.tensorflow.proto.Struct.TypeSpecProto.Builder, org.tensorflow.proto.Struct.TypeSpecProtoOrBuilder> 
-          getTypeSpecFieldBuilder() {
+          internalGetTypeSpecFieldBuilder() {
         if (typeSpecBuilder_ == null) {
           typeSpecBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.Struct.TypeSpecProto, org.tensorflow.proto.Struct.TypeSpecProto.Builder, org.tensorflow.proto.Struct.TypeSpecProtoOrBuilder>(
@@ -1987,7 +1988,7 @@ public Builder removeComponents(int index) {
        */
       public org.tensorflow.proto.TensorInfo.Builder getComponentsBuilder(
           int index) {
-        return getComponentsFieldBuilder().getBuilder(index);
+        return internalGetComponentsFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -2026,7 +2027,7 @@ public org.tensorflow.proto.TensorInfoOrBuilder getComponentsOrBuilder(
        * repeated .tensorflow.TensorInfo components = 2;
        */
       public org.tensorflow.proto.TensorInfo.Builder addComponentsBuilder() {
-        return getComponentsFieldBuilder().addBuilder(
+        return internalGetComponentsFieldBuilder().addBuilder(
             org.tensorflow.proto.TensorInfo.getDefaultInstance());
       }
       /**
@@ -2038,7 +2039,7 @@ public org.tensorflow.proto.TensorInfo.Builder addComponentsBuilder() {
        */
       public org.tensorflow.proto.TensorInfo.Builder addComponentsBuilder(
           int index) {
-        return getComponentsFieldBuilder().addBuilder(
+        return internalGetComponentsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TensorInfo.getDefaultInstance());
       }
       /**
@@ -2050,11 +2051,11 @@ public org.tensorflow.proto.TensorInfo.Builder addComponentsBuilder(
        */
       public java.util.List 
            getComponentsBuilderList() {
-        return getComponentsFieldBuilder().getBuilderList();
+        return internalGetComponentsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TensorInfo, org.tensorflow.proto.TensorInfo.Builder, org.tensorflow.proto.TensorInfoOrBuilder> 
-          getComponentsFieldBuilder() {
+          internalGetComponentsFieldBuilder() {
         if (componentsBuilder_ == null) {
           componentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TensorInfo, org.tensorflow.proto.TensorInfo.Builder, org.tensorflow.proto.TensorInfoOrBuilder>(
@@ -2646,7 +2647,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorShapeFieldBuilder();
+        internalGetTensorShapeFieldBuilder();
       }
     }
     @java.lang.Override
@@ -2803,21 +2804,21 @@ public Builder mergeFrom(
             } // case 16
             case 26: {
               input.readMessage(
-                  getTensorShapeFieldBuilder().getBuilder(),
+                  internalGetTensorShapeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000010;
               break;
             } // case 26
             case 34: {
               input.readMessage(
-                  getCooSparseFieldBuilder().getBuilder(),
+                  internalGetCooSparseFieldBuilder().getBuilder(),
                   extensionRegistry);
               encodingCase_ = 4;
               break;
             } // case 34
             case 42: {
               input.readMessage(
-                  getCompositeTensorFieldBuilder().getBuilder(),
+                  internalGetCompositeTensorFieldBuilder().getBuilder(),
                   extensionRegistry);
               encodingCase_ = 5;
               break;
@@ -3124,7 +3125,7 @@ public Builder clearCooSparse() {
      * .tensorflow.TensorInfo.CooSparse coo_sparse = 4;
      */
     public org.tensorflow.proto.TensorInfo.CooSparse.Builder getCooSparseBuilder() {
-      return getCooSparseFieldBuilder().getBuilder();
+      return internalGetCooSparseFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -3159,7 +3160,7 @@ public org.tensorflow.proto.TensorInfo.CooSparseOrBuilder getCooSparseOrBuilder(
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorInfo.CooSparse, org.tensorflow.proto.TensorInfo.CooSparse.Builder, org.tensorflow.proto.TensorInfo.CooSparseOrBuilder> 
-        getCooSparseFieldBuilder() {
+        internalGetCooSparseFieldBuilder() {
       if (cooSparseBuilder_ == null) {
         if (!(encodingCase_ == 4)) {
           encoding_ = org.tensorflow.proto.TensorInfo.CooSparse.getDefaultInstance();
@@ -3308,7 +3309,7 @@ public Builder clearCompositeTensor() {
      * .tensorflow.TensorInfo.CompositeTensor composite_tensor = 5;
      */
     public org.tensorflow.proto.TensorInfo.CompositeTensor.Builder getCompositeTensorBuilder() {
-      return getCompositeTensorFieldBuilder().getBuilder();
+      return internalGetCompositeTensorFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -3337,7 +3338,7 @@ public org.tensorflow.proto.TensorInfo.CompositeTensorOrBuilder getCompositeTens
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorInfo.CompositeTensor, org.tensorflow.proto.TensorInfo.CompositeTensor.Builder, org.tensorflow.proto.TensorInfo.CompositeTensorOrBuilder> 
-        getCompositeTensorFieldBuilder() {
+        internalGetCompositeTensorFieldBuilder() {
       if (compositeTensorBuilder_ == null) {
         if (!(encodingCase_ == 5)) {
           encoding_ = org.tensorflow.proto.TensorInfo.CompositeTensor.getDefaultInstance();
@@ -3388,9 +3389,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000008;
       dtype_ = value.getNumber();
       onChanged();
@@ -3540,7 +3539,7 @@ public Builder clearTensorShape() {
     public org.tensorflow.proto.TensorShapeProto.Builder getTensorShapeBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
-      return getTensorShapeFieldBuilder().getBuilder();
+      return internalGetTensorShapeFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -3570,7 +3569,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getTensorShapeOrBuilder()
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-        getTensorShapeFieldBuilder() {
+        internalGetTensorShapeFieldBuilder() {
       if (tensorShapeBuilder_ == null) {
         tensorShapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorInfoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorInfoOrBuilder.java
index e6f8bc5266b..cf716078ac8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorInfoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorInfoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/meta_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TensorInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TensorInfo)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProto.java
index 16963543fb5..ead31631e57 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.TensorProto}
  */
+@com.google.protobuf.Generated
 public final class TensorProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TensorProto)
@@ -21,8 +22,8 @@ public final class TensorProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorProto.class.getName());
   }
@@ -1315,9 +1316,9 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getTensorShapeFieldBuilder();
-        getResourceHandleValFieldBuilder();
-        getVariantValFieldBuilder();
+        internalGetTensorShapeFieldBuilder();
+        internalGetResourceHandleValFieldBuilder();
+        internalGetVariantValFieldBuilder();
       }
     }
     @java.lang.Override
@@ -1500,7 +1501,7 @@ public Builder mergeFrom(org.tensorflow.proto.TensorProto other) {
       if (other.getVersionNumber() != 0) {
         setVersionNumber(other.getVersionNumber());
       }
-      if (other.getTensorContent() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getTensorContent().isEmpty()) {
         setTensorContent(other.getTensorContent());
       }
       if (!other.halfVal_.isEmpty()) {
@@ -1622,7 +1623,7 @@ public Builder mergeFrom(org.tensorflow.proto.TensorProto other) {
             bitField0_ = (bitField0_ & ~0x00002000);
             resourceHandleValBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getResourceHandleValFieldBuilder() : null;
+                 internalGetResourceHandleValFieldBuilder() : null;
           } else {
             resourceHandleValBuilder_.addAllMessages(other.resourceHandleVal_);
           }
@@ -1648,7 +1649,7 @@ public Builder mergeFrom(org.tensorflow.proto.TensorProto other) {
             bitField0_ = (bitField0_ & ~0x00004000);
             variantValBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getVariantValFieldBuilder() : null;
+                 internalGetVariantValFieldBuilder() : null;
           } else {
             variantValBuilder_.addAllMessages(other.variantVal_);
           }
@@ -1676,7 +1677,7 @@ public Builder mergeFrom(org.tensorflow.proto.TensorProto other) {
         }
         onChanged();
       }
-      if (other.getFloat8Val() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getFloat8Val().isEmpty()) {
         setFloat8Val(other.getFloat8Val());
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1712,7 +1713,7 @@ public Builder mergeFrom(
             } // case 8
             case 18: {
               input.readMessage(
-                  getTensorShapeFieldBuilder().getBuilder(),
+                  internalGetTensorShapeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -1996,9 +1997,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       dtype_ = value.getNumber();
       onChanged();
@@ -2138,7 +2137,7 @@ public Builder clearTensorShape() {
     public org.tensorflow.proto.TensorShapeProto.Builder getTensorShapeBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getTensorShapeFieldBuilder().getBuilder();
+      return internalGetTensorShapeFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2164,7 +2163,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getTensorShapeOrBuilder()
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-        getTensorShapeFieldBuilder() {
+        internalGetTensorShapeFieldBuilder() {
       if (tensorShapeBuilder_ == null) {
         tensorShapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -3579,7 +3578,7 @@ public Builder removeResourceHandleVal(int index) {
      */
     public org.tensorflow.proto.ResourceHandleProto.Builder getResourceHandleValBuilder(
         int index) {
-      return getResourceHandleValFieldBuilder().getBuilder(index);
+      return internalGetResourceHandleValFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -3618,7 +3617,7 @@ public org.tensorflow.proto.ResourceHandleProtoOrBuilder getResourceHandleValOrB
      * repeated .tensorflow.ResourceHandleProto resource_handle_val = 14;
      */
     public org.tensorflow.proto.ResourceHandleProto.Builder addResourceHandleValBuilder() {
-      return getResourceHandleValFieldBuilder().addBuilder(
+      return internalGetResourceHandleValFieldBuilder().addBuilder(
           org.tensorflow.proto.ResourceHandleProto.getDefaultInstance());
     }
     /**
@@ -3630,7 +3629,7 @@ public org.tensorflow.proto.ResourceHandleProto.Builder addResourceHandleValBuil
      */
     public org.tensorflow.proto.ResourceHandleProto.Builder addResourceHandleValBuilder(
         int index) {
-      return getResourceHandleValFieldBuilder().addBuilder(
+      return internalGetResourceHandleValFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ResourceHandleProto.getDefaultInstance());
     }
     /**
@@ -3642,11 +3641,11 @@ public org.tensorflow.proto.ResourceHandleProto.Builder addResourceHandleValBuil
      */
     public java.util.List 
          getResourceHandleValBuilderList() {
-      return getResourceHandleValFieldBuilder().getBuilderList();
+      return internalGetResourceHandleValFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ResourceHandleProto, org.tensorflow.proto.ResourceHandleProto.Builder, org.tensorflow.proto.ResourceHandleProtoOrBuilder> 
-        getResourceHandleValFieldBuilder() {
+        internalGetResourceHandleValFieldBuilder() {
       if (resourceHandleValBuilder_ == null) {
         resourceHandleValBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ResourceHandleProto, org.tensorflow.proto.ResourceHandleProto.Builder, org.tensorflow.proto.ResourceHandleProtoOrBuilder>(
@@ -3891,7 +3890,7 @@ public Builder removeVariantVal(int index) {
      */
     public org.tensorflow.proto.VariantTensorDataProto.Builder getVariantValBuilder(
         int index) {
-      return getVariantValFieldBuilder().getBuilder(index);
+      return internalGetVariantValFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -3930,7 +3929,7 @@ public org.tensorflow.proto.VariantTensorDataProtoOrBuilder getVariantValOrBuild
      * repeated .tensorflow.VariantTensorDataProto variant_val = 15;
      */
     public org.tensorflow.proto.VariantTensorDataProto.Builder addVariantValBuilder() {
-      return getVariantValFieldBuilder().addBuilder(
+      return internalGetVariantValFieldBuilder().addBuilder(
           org.tensorflow.proto.VariantTensorDataProto.getDefaultInstance());
     }
     /**
@@ -3942,7 +3941,7 @@ public org.tensorflow.proto.VariantTensorDataProto.Builder addVariantValBuilder(
      */
     public org.tensorflow.proto.VariantTensorDataProto.Builder addVariantValBuilder(
         int index) {
-      return getVariantValFieldBuilder().addBuilder(
+      return internalGetVariantValFieldBuilder().addBuilder(
           index, org.tensorflow.proto.VariantTensorDataProto.getDefaultInstance());
     }
     /**
@@ -3954,11 +3953,11 @@ public org.tensorflow.proto.VariantTensorDataProto.Builder addVariantValBuilder(
      */
     public java.util.List 
          getVariantValBuilderList() {
-      return getVariantValFieldBuilder().getBuilderList();
+      return internalGetVariantValFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.VariantTensorDataProto, org.tensorflow.proto.VariantTensorDataProto.Builder, org.tensorflow.proto.VariantTensorDataProtoOrBuilder> 
-        getVariantValFieldBuilder() {
+        internalGetVariantValFieldBuilder() {
       if (variantValBuilder_ == null) {
         variantValBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.VariantTensorDataProto, org.tensorflow.proto.VariantTensorDataProto.Builder, org.tensorflow.proto.VariantTensorDataProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProtoOrBuilder.java
index 193c60a945a..68bfb7f709e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TensorProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TensorProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProtos.java
index 5641fea4fdc..b006dd9173a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TensorProtos {
   private TensorProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProto.java
index 3e0f3a3387c..4ab49a50c04 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_shape.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.TensorShapeProto}
  */
+@com.google.protobuf.Generated
 public final class TensorShapeProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TensorShapeProto)
@@ -21,8 +22,8 @@ public final class TensorShapeProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorShapeProto.class.getName());
   }
@@ -101,8 +102,8 @@ public static final class Dim extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Dim.class.getName());
     }
@@ -1152,7 +1153,7 @@ public Builder mergeFrom(org.tensorflow.proto.TensorShapeProto other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             dimBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getDimFieldBuilder() : null;
+                 internalGetDimFieldBuilder() : null;
           } else {
             dimBuilder_.addAllMessages(other.dim_);
           }
@@ -1610,7 +1611,7 @@ public Builder removeDim(int index) {
      */
     public org.tensorflow.proto.TensorShapeProto.Dim.Builder getDimBuilder(
         int index) {
-      return getDimFieldBuilder().getBuilder(index);
+      return internalGetDimFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1685,7 +1686,7 @@ public org.tensorflow.proto.TensorShapeProto.DimOrBuilder getDimOrBuilder(
      * repeated .tensorflow.TensorShapeProto.Dim dim = 2;
      */
     public org.tensorflow.proto.TensorShapeProto.Dim.Builder addDimBuilder() {
-      return getDimFieldBuilder().addBuilder(
+      return internalGetDimFieldBuilder().addBuilder(
           org.tensorflow.proto.TensorShapeProto.Dim.getDefaultInstance());
     }
     /**
@@ -1709,7 +1710,7 @@ public org.tensorflow.proto.TensorShapeProto.Dim.Builder addDimBuilder() {
      */
     public org.tensorflow.proto.TensorShapeProto.Dim.Builder addDimBuilder(
         int index) {
-      return getDimFieldBuilder().addBuilder(
+      return internalGetDimFieldBuilder().addBuilder(
           index, org.tensorflow.proto.TensorShapeProto.Dim.getDefaultInstance());
     }
     /**
@@ -1733,11 +1734,11 @@ public org.tensorflow.proto.TensorShapeProto.Dim.Builder addDimBuilder(
      */
     public java.util.List 
          getDimBuilderList() {
-      return getDimFieldBuilder().getBuilderList();
+      return internalGetDimFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.TensorShapeProto.Dim, org.tensorflow.proto.TensorShapeProto.Dim.Builder, org.tensorflow.proto.TensorShapeProto.DimOrBuilder> 
-        getDimFieldBuilder() {
+        internalGetDimFieldBuilder() {
       if (dimBuilder_ == null) {
         dimBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TensorShapeProto.Dim, org.tensorflow.proto.TensorShapeProto.Dim.Builder, org.tensorflow.proto.TensorShapeProto.DimOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProtoOrBuilder.java
index abdb7c2a2dc..73e07c47dd1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_shape.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TensorShapeProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TensorShapeProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProtos.java
index 0d6cdfd8d58..1d5fb8b81b8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorShapeProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_shape.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TensorShapeProtos {
   private TensorShapeProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorShapeProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProto.java
index dde6d3207de..e7f3b3081bd 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.TensorSliceProto}
  */
+@com.google.protobuf.Generated
 public final class TensorSliceProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TensorSliceProto)
@@ -21,8 +22,8 @@ public final class TensorSliceProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorSliceProto.class.getName());
   }
@@ -72,7 +73,7 @@ public interface ExtentOrBuilder extends
      */
     long getLength();
 
-    org.tensorflow.proto.TensorSliceProto.Extent.HasLengthCase getHasLengthCase();
+    org.tensorflow.proto.TensorSliceProto.Extent.HasLengthHackCase getHasLengthHackCase();
   }
   /**
    * 
@@ -90,8 +91,8 @@ public static final class Extent extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Extent.class.getName());
     }
@@ -115,16 +116,16 @@ private Extent() {
               org.tensorflow.proto.TensorSliceProto.Extent.class, org.tensorflow.proto.TensorSliceProto.Extent.Builder.class);
     }
 
-    private int hasLengthCase_ = 0;
+    private int hasLengthHackCase_ = 0;
     @SuppressWarnings("serial")
-    private java.lang.Object hasLength_;
-    public enum HasLengthCase
+    private java.lang.Object hasLengthHack_;
+    public enum HasLengthHackCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
       LENGTH(2),
-      HASLENGTH_NOT_SET(0);
+      HASLENGTHHACK_NOT_SET(0);
       private final int value;
-      private HasLengthCase(int value) {
+      private HasLengthHackCase(int value) {
         this.value = value;
       }
       /**
@@ -133,14 +134,14 @@ private HasLengthCase(int value) {
        * @deprecated Use {@link #forNumber(int)} instead.
        */
       @java.lang.Deprecated
-      public static HasLengthCase valueOf(int value) {
+      public static HasLengthHackCase valueOf(int value) {
         return forNumber(value);
       }
 
-      public static HasLengthCase forNumber(int value) {
+      public static HasLengthHackCase forNumber(int value) {
         switch (value) {
           case 2: return LENGTH;
-          case 0: return HASLENGTH_NOT_SET;
+          case 0: return HASLENGTHHACK_NOT_SET;
           default: return null;
         }
       }
@@ -149,10 +150,10 @@ public int getNumber() {
       }
     };
 
-    public HasLengthCase
-    getHasLengthCase() {
-      return HasLengthCase.forNumber(
-          hasLengthCase_);
+    public HasLengthHackCase
+    getHasLengthHackCase() {
+      return HasLengthHackCase.forNumber(
+          hasLengthHackCase_);
     }
 
     public static final int START_FIELD_NUMBER = 1;
@@ -177,7 +178,7 @@ public long getStart() {
      */
     @java.lang.Override
     public boolean hasLength() {
-      return hasLengthCase_ == 2;
+      return hasLengthHackCase_ == 2;
     }
     /**
      * int64 length = 2;
@@ -185,8 +186,8 @@ public boolean hasLength() {
      */
     @java.lang.Override
     public long getLength() {
-      if (hasLengthCase_ == 2) {
-        return (java.lang.Long) hasLength_;
+      if (hasLengthHackCase_ == 2) {
+        return (java.lang.Long) hasLengthHack_;
       }
       return 0L;
     }
@@ -208,9 +209,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (start_ != 0L) {
         output.writeInt64(1, start_);
       }
-      if (hasLengthCase_ == 2) {
+      if (hasLengthHackCase_ == 2) {
         output.writeInt64(
-            2, (long)((java.lang.Long) hasLength_));
+            2, (long)((java.lang.Long) hasLengthHack_));
       }
       getUnknownFields().writeTo(output);
     }
@@ -225,10 +226,10 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(1, start_);
       }
-      if (hasLengthCase_ == 2) {
+      if (hasLengthHackCase_ == 2) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(
-              2, (long)((java.lang.Long) hasLength_));
+              2, (long)((java.lang.Long) hasLengthHack_));
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -247,8 +248,8 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getStart()
           != other.getStart()) return false;
-      if (!getHasLengthCase().equals(other.getHasLengthCase())) return false;
-      switch (hasLengthCase_) {
+      if (!getHasLengthHackCase().equals(other.getHasLengthHackCase())) return false;
+      switch (hasLengthHackCase_) {
         case 2:
           if (getLength()
               != other.getLength()) return false;
@@ -270,7 +271,7 @@ public int hashCode() {
       hash = (37 * hash) + START_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getStart());
-      switch (hasLengthCase_) {
+      switch (hasLengthHackCase_) {
         case 2:
           hash = (37 * hash) + LENGTH_FIELD_NUMBER;
           hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
@@ -415,8 +416,8 @@ public Builder clear() {
         super.clear();
         bitField0_ = 0;
         start_ = 0L;
-        hasLengthCase_ = 0;
-        hasLength_ = null;
+        hasLengthHackCase_ = 0;
+        hasLengthHack_ = null;
         return this;
       }
 
@@ -457,8 +458,8 @@ private void buildPartial0(org.tensorflow.proto.TensorSliceProto.Extent result)
       }
 
       private void buildPartialOneofs(org.tensorflow.proto.TensorSliceProto.Extent result) {
-        result.hasLengthCase_ = hasLengthCase_;
-        result.hasLength_ = this.hasLength_;
+        result.hasLengthHackCase_ = hasLengthHackCase_;
+        result.hasLengthHack_ = this.hasLengthHack_;
       }
 
       @java.lang.Override
@@ -476,12 +477,12 @@ public Builder mergeFrom(org.tensorflow.proto.TensorSliceProto.Extent other) {
         if (other.getStart() != 0L) {
           setStart(other.getStart());
         }
-        switch (other.getHasLengthCase()) {
+        switch (other.getHasLengthHackCase()) {
           case LENGTH: {
             setLength(other.getLength());
             break;
           }
-          case HASLENGTH_NOT_SET: {
+          case HASLENGTHHACK_NOT_SET: {
             break;
           }
         }
@@ -517,8 +518,8 @@ public Builder mergeFrom(
                 break;
               } // case 8
               case 16: {
-                hasLength_ = input.readInt64();
-                hasLengthCase_ = 2;
+                hasLengthHack_ = input.readInt64();
+                hasLengthHackCase_ = 2;
                 break;
               } // case 16
               default: {
@@ -536,17 +537,17 @@ public Builder mergeFrom(
         } // finally
         return this;
       }
-      private int hasLengthCase_ = 0;
-      private java.lang.Object hasLength_;
-      public HasLengthCase
-          getHasLengthCase() {
-        return HasLengthCase.forNumber(
-            hasLengthCase_);
+      private int hasLengthHackCase_ = 0;
+      private java.lang.Object hasLengthHack_;
+      public HasLengthHackCase
+          getHasLengthHackCase() {
+        return HasLengthHackCase.forNumber(
+            hasLengthHackCase_);
       }
 
-      public Builder clearHasLength() {
-        hasLengthCase_ = 0;
-        hasLength_ = null;
+      public Builder clearHasLengthHack() {
+        hasLengthHackCase_ = 0;
+        hasLengthHack_ = null;
         onChanged();
         return this;
       }
@@ -602,15 +603,15 @@ public Builder clearStart() {
        * @return Whether the length field is set.
        */
       public boolean hasLength() {
-        return hasLengthCase_ == 2;
+        return hasLengthHackCase_ == 2;
       }
       /**
        * int64 length = 2;
        * @return The length.
        */
       public long getLength() {
-        if (hasLengthCase_ == 2) {
-          return (java.lang.Long) hasLength_;
+        if (hasLengthHackCase_ == 2) {
+          return (java.lang.Long) hasLengthHack_;
         }
         return 0L;
       }
@@ -621,8 +622,8 @@ public long getLength() {
        */
       public Builder setLength(long value) {
 
-        hasLengthCase_ = 2;
-        hasLength_ = value;
+        hasLengthHackCase_ = 2;
+        hasLengthHack_ = value;
         onChanged();
         return this;
       }
@@ -631,9 +632,9 @@ public Builder setLength(long value) {
        * @return This builder for chaining.
        */
       public Builder clearLength() {
-        if (hasLengthCase_ == 2) {
-          hasLengthCase_ = 0;
-          hasLength_ = null;
+        if (hasLengthHackCase_ == 2) {
+          hasLengthHackCase_ = 0;
+          hasLengthHack_ = null;
           onChanged();
         }
         return this;
@@ -1055,7 +1056,7 @@ public Builder mergeFrom(org.tensorflow.proto.TensorSliceProto other) {
             bitField0_ = (bitField0_ & ~0x00000001);
             extentBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getExtentFieldBuilder() : null;
+                 internalGetExtentFieldBuilder() : null;
           } else {
             extentBuilder_.addAllMessages(other.extent_);
           }
@@ -1401,7 +1402,7 @@ public Builder removeExtent(int index) {
      */
     public org.tensorflow.proto.TensorSliceProto.Extent.Builder getExtentBuilder(
         int index) {
-      return getExtentFieldBuilder().getBuilder(index);
+      return internalGetExtentFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1452,7 +1453,7 @@ public org.tensorflow.proto.TensorSliceProto.ExtentOrBuilder getExtentOrBuilder(
      * repeated .tensorflow.TensorSliceProto.Extent extent = 1;
      */
     public org.tensorflow.proto.TensorSliceProto.Extent.Builder addExtentBuilder() {
-      return getExtentFieldBuilder().addBuilder(
+      return internalGetExtentFieldBuilder().addBuilder(
           org.tensorflow.proto.TensorSliceProto.Extent.getDefaultInstance());
     }
     /**
@@ -1468,7 +1469,7 @@ public org.tensorflow.proto.TensorSliceProto.Extent.Builder addExtentBuilder() {
      */
     public org.tensorflow.proto.TensorSliceProto.Extent.Builder addExtentBuilder(
         int index) {
-      return getExtentFieldBuilder().addBuilder(
+      return internalGetExtentFieldBuilder().addBuilder(
           index, org.tensorflow.proto.TensorSliceProto.Extent.getDefaultInstance());
     }
     /**
@@ -1484,11 +1485,11 @@ public org.tensorflow.proto.TensorSliceProto.Extent.Builder addExtentBuilder(
      */
     public java.util.List 
          getExtentBuilderList() {
-      return getExtentFieldBuilder().getBuilderList();
+      return internalGetExtentFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.TensorSliceProto.Extent, org.tensorflow.proto.TensorSliceProto.Extent.Builder, org.tensorflow.proto.TensorSliceProto.ExtentOrBuilder> 
-        getExtentFieldBuilder() {
+        internalGetExtentFieldBuilder() {
       if (extentBuilder_ == null) {
         extentBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TensorSliceProto.Extent, org.tensorflow.proto.TensorSliceProto.Extent.Builder, org.tensorflow.proto.TensorSliceProto.ExtentOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProtoOrBuilder.java
index c288cadbbf0..481afc588a9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TensorSliceProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TensorSliceProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProtos.java
index fbbde962a98..1fa7781c471 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TensorSliceProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor_slice.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TensorSliceProtos {
   private TensorSliceProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TensorSliceProtos.class.getName());
   }
@@ -45,14 +46,14 @@ public static void registerAllExtensions(
   static {
     java.lang.String[] descriptorData = {
       "\n,tensorflow/core/framework/tensor_slice" +
-      ".proto\022\ntensorflow\"\200\001\n\020TensorSliceProto\022" +
+      ".proto\022\ntensorflow\"\205\001\n\020TensorSliceProto\022" +
       "3\n\006extent\030\001 \003(\0132#.tensorflow.TensorSlice" +
-      "Proto.Extent\0327\n\006Extent\022\r\n\005start\030\001 \001(\003\022\020\n" +
-      "\006length\030\002 \001(\003H\000B\014\n\nhas_lengthB\203\001\n\024org.te" +
-      "nsorflow.protoB\021TensorSliceProtosP\001ZSgit" +
-      "hub.com/tensorflow/tensorflow/tensorflow" +
-      "/go/core/framework/tensor_slice_go_proto" +
-      "\370\001\001b\006proto3"
+      "Proto.Extent\032<\n\006Extent\022\r\n\005start\030\001 \001(\003\022\020\n" +
+      "\006length\030\002 \001(\003H\000B\021\n\017has_length_hackB\203\001\n\024o" +
+      "rg.tensorflow.protoB\021TensorSliceProtosP\001" +
+      "ZSgithub.com/tensorflow/tensorflow/tenso" +
+      "rflow/go/core/framework/tensor_slice_go_" +
+      "proto\370\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -69,7 +70,7 @@ public static void registerAllExtensions(
     internal_static_tensorflow_TensorSliceProto_Extent_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_tensorflow_TensorSliceProto_Extent_descriptor,
-        new java.lang.String[] { "Start", "Length", "HasLength", });
+        new java.lang.String[] { "Start", "Length", "HasLengthHack", });
     descriptor.resolveAllFeaturesImmutable();
   }
 
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestLogProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestLogProtos.java
index 4e6ef7c4896..fe4194be65f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestLogProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestLogProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TestLogProtos {
   private TestLogProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TestLogProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestResults.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestResults.java
index 673f570f56a..400dad43483 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestResults.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestResults.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -18,6 +18,7 @@
  *
  * Protobuf type {@code tensorflow.TestResults}
  */
+@com.google.protobuf.Generated
 public final class TestResults extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.TestResults)
@@ -27,8 +28,8 @@ public final class TestResults extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TestResults.class.getName());
   }
@@ -101,8 +102,8 @@ public enum BenchmarkType
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         BenchmarkType.class.getName());
     }
@@ -194,7 +195,7 @@ public BenchmarkType findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.TestResults.getDescriptor().getEnumTypes().get(0);
     }
@@ -1005,11 +1006,11 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getEntriesFieldBuilder();
-        getBuildConfigurationFieldBuilder();
-        getCommitIdFieldBuilder();
-        getMachineConfigurationFieldBuilder();
-        getRunConfigurationFieldBuilder();
+        internalGetEntriesFieldBuilder();
+        internalGetBuildConfigurationFieldBuilder();
+        internalGetCommitIdFieldBuilder();
+        internalGetMachineConfigurationFieldBuilder();
+        internalGetRunConfigurationFieldBuilder();
       }
     }
     @java.lang.Override
@@ -1165,7 +1166,7 @@ public Builder mergeFrom(org.tensorflow.proto.TestResults other) {
       if (other.getStartTime() != 0L) {
         setStartTime(other.getStartTime());
       }
-      if (other.getRunTime() != 0D) {
+      if (java.lang.Double.doubleToRawLongBits(other.getRunTime()) != 0) {
         setRunTime(other.getRunTime());
       }
       if (other.hasMachineConfiguration()) {
@@ -1225,21 +1226,21 @@ public Builder mergeFrom(
             } // case 10
             case 18: {
               input.readMessage(
-                  getEntriesFieldBuilder().getBuilder(),
+                  internalGetEntriesFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
             } // case 18
             case 26: {
               input.readMessage(
-                  getBuildConfigurationFieldBuilder().getBuilder(),
+                  internalGetBuildConfigurationFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
             } // case 26
             case 34: {
               input.readMessage(
-                  getCommitIdFieldBuilder().getBuilder(),
+                  internalGetCommitIdFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000008;
               break;
@@ -1256,14 +1257,14 @@ public Builder mergeFrom(
             } // case 49
             case 58: {
               input.readMessage(
-                  getMachineConfigurationFieldBuilder().getBuilder(),
+                  internalGetMachineConfigurationFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000040;
               break;
             } // case 58
             case 66: {
               input.readMessage(
-                  getRunConfigurationFieldBuilder().getBuilder(),
+                  internalGetRunConfigurationFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000080;
               break;
@@ -1521,7 +1522,7 @@ public Builder clearEntries() {
     public org.tensorflow.proto.BenchmarkEntries.Builder getEntriesBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getEntriesFieldBuilder().getBuilder();
+      return internalGetEntriesFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1547,7 +1548,7 @@ public org.tensorflow.proto.BenchmarkEntriesOrBuilder getEntriesOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.BenchmarkEntries, org.tensorflow.proto.BenchmarkEntries.Builder, org.tensorflow.proto.BenchmarkEntriesOrBuilder> 
-        getEntriesFieldBuilder() {
+        internalGetEntriesFieldBuilder() {
       if (entriesBuilder_ == null) {
         entriesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.BenchmarkEntries, org.tensorflow.proto.BenchmarkEntries.Builder, org.tensorflow.proto.BenchmarkEntriesOrBuilder>(
@@ -1678,7 +1679,7 @@ public Builder clearBuildConfiguration() {
     public org.tensorflow.proto.BuildConfiguration.Builder getBuildConfigurationBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getBuildConfigurationFieldBuilder().getBuilder();
+      return internalGetBuildConfigurationFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1704,7 +1705,7 @@ public org.tensorflow.proto.BuildConfigurationOrBuilder getBuildConfigurationOrB
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.BuildConfiguration, org.tensorflow.proto.BuildConfiguration.Builder, org.tensorflow.proto.BuildConfigurationOrBuilder> 
-        getBuildConfigurationFieldBuilder() {
+        internalGetBuildConfigurationFieldBuilder() {
       if (buildConfigurationBuilder_ == null) {
         buildConfigurationBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.BuildConfiguration, org.tensorflow.proto.BuildConfiguration.Builder, org.tensorflow.proto.BuildConfigurationOrBuilder>(
@@ -1835,7 +1836,7 @@ public Builder clearCommitId() {
     public org.tensorflow.proto.CommitId.Builder getCommitIdBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
-      return getCommitIdFieldBuilder().getBuilder();
+      return internalGetCommitIdFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1861,7 +1862,7 @@ public org.tensorflow.proto.CommitIdOrBuilder getCommitIdOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.CommitId, org.tensorflow.proto.CommitId.Builder, org.tensorflow.proto.CommitIdOrBuilder> 
-        getCommitIdFieldBuilder() {
+        internalGetCommitIdFieldBuilder() {
       if (commitIdBuilder_ == null) {
         commitIdBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.CommitId, org.tensorflow.proto.CommitId.Builder, org.tensorflow.proto.CommitIdOrBuilder>(
@@ -2080,7 +2081,7 @@ public Builder clearMachineConfiguration() {
     public org.tensorflow.proto.MachineConfiguration.Builder getMachineConfigurationBuilder() {
       bitField0_ |= 0x00000040;
       onChanged();
-      return getMachineConfigurationFieldBuilder().getBuilder();
+      return internalGetMachineConfigurationFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2106,7 +2107,7 @@ public org.tensorflow.proto.MachineConfigurationOrBuilder getMachineConfiguratio
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.MachineConfiguration, org.tensorflow.proto.MachineConfiguration.Builder, org.tensorflow.proto.MachineConfigurationOrBuilder> 
-        getMachineConfigurationFieldBuilder() {
+        internalGetMachineConfigurationFieldBuilder() {
       if (machineConfigurationBuilder_ == null) {
         machineConfigurationBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.MachineConfiguration, org.tensorflow.proto.MachineConfiguration.Builder, org.tensorflow.proto.MachineConfigurationOrBuilder>(
@@ -2237,7 +2238,7 @@ public Builder clearRunConfiguration() {
     public org.tensorflow.proto.RunConfiguration.Builder getRunConfigurationBuilder() {
       bitField0_ |= 0x00000080;
       onChanged();
-      return getRunConfigurationFieldBuilder().getBuilder();
+      return internalGetRunConfigurationFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2263,7 +2264,7 @@ public org.tensorflow.proto.RunConfigurationOrBuilder getRunConfigurationOrBuild
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.RunConfiguration, org.tensorflow.proto.RunConfiguration.Builder, org.tensorflow.proto.RunConfigurationOrBuilder> 
-        getRunConfigurationFieldBuilder() {
+        internalGetRunConfigurationFieldBuilder() {
       if (runConfigurationBuilder_ == null) {
         runConfigurationBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.RunConfiguration, org.tensorflow.proto.RunConfiguration.Builder, org.tensorflow.proto.RunConfigurationOrBuilder>(
@@ -2401,9 +2402,7 @@ public org.tensorflow.proto.TestResults.BenchmarkType getBenchmarkType() {
      * @return This builder for chaining.
      */
     public Builder setBenchmarkType(org.tensorflow.proto.TestResults.BenchmarkType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000200;
       benchmarkType_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestResultsOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestResultsOrBuilder.java
index ec051f94716..2a44cf9c866 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestResultsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TestResultsOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface TestResultsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.TestResults)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ThreadPoolOptionProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ThreadPoolOptionProto.java
index b5618ce9bed..a7192b7207e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ThreadPoolOptionProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ThreadPoolOptionProto.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.ThreadPoolOptionProto}
  */
+@com.google.protobuf.Generated
 public final class ThreadPoolOptionProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ThreadPoolOptionProto)
@@ -17,8 +18,8 @@ public final class ThreadPoolOptionProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ThreadPoolOptionProto.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ThreadPoolOptionProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ThreadPoolOptionProtoOrBuilder.java
index 293e6914f9f..37bfff07f7b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ThreadPoolOptionProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ThreadPoolOptionProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ThreadPoolOptionProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ThreadPoolOptionProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TrackableObjectGraphOuterClass.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TrackableObjectGraphOuterClass.java
index 4ab6b3965d8..7b2e4aaf8fe 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TrackableObjectGraphOuterClass.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TrackableObjectGraphOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/trackable_object_graph.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TrackableObjectGraphOuterClass {
   private TrackableObjectGraphOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TrackableObjectGraphOuterClass.class.getName());
   }
@@ -65,8 +66,8 @@ public static final class TrackableObjectGraph extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TrackableObjectGraph.class.getName());
     }
@@ -305,8 +306,8 @@ public static final class TrackableObject extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           TrackableObject.class.getName());
       }
@@ -380,8 +381,8 @@ public static final class ObjectReference extends
           com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
             com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
             /* major= */ 4,
-            /* minor= */ 28,
-            /* patch= */ 3,
+            /* minor= */ 31,
+            /* patch= */ 1,
             /* suffix= */ "",
             ObjectReference.class.getName());
         }
@@ -1062,8 +1063,8 @@ public static final class SerializedTensor extends
           com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
             com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
             /* major= */ 4,
-            /* minor= */ 28,
-            /* patch= */ 3,
+            /* minor= */ 31,
+            /* patch= */ 1,
             /* suffix= */ "",
             SerializedTensor.class.getName());
         }
@@ -1993,8 +1994,8 @@ public static final class SlotVariableReference extends
           com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
             com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
             /* major= */ 4,
-            /* minor= */ 28,
-            /* patch= */ 3,
+            /* minor= */ 31,
+            /* patch= */ 1,
             /* suffix= */ "",
             SlotVariableReference.class.getName());
         }
@@ -3197,11 +3198,11 @@ private Builder(
         private void maybeForceBuilderInitialization() {
           if (com.google.protobuf.GeneratedMessage
                   .alwaysUseFieldBuilders) {
-            getChildrenFieldBuilder();
-            getAttributesFieldBuilder();
-            getSlotVariablesFieldBuilder();
-            getRegisteredSaverFieldBuilder();
-            getHasCheckpointValuesFieldBuilder();
+            internalGetChildrenFieldBuilder();
+            internalGetAttributesFieldBuilder();
+            internalGetSlotVariablesFieldBuilder();
+            internalGetRegisteredSaverFieldBuilder();
+            internalGetHasCheckpointValuesFieldBuilder();
           }
         }
         @java.lang.Override
@@ -3351,7 +3352,7 @@ public Builder mergeFrom(org.tensorflow.proto.TrackableObjectGraphOuterClass.Tra
                 bitField0_ = (bitField0_ & ~0x00000001);
                 childrenBuilder_ = 
                   com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                     getChildrenFieldBuilder() : null;
+                     internalGetChildrenFieldBuilder() : null;
               } else {
                 childrenBuilder_.addAllMessages(other.children_);
               }
@@ -3377,7 +3378,7 @@ public Builder mergeFrom(org.tensorflow.proto.TrackableObjectGraphOuterClass.Tra
                 bitField0_ = (bitField0_ & ~0x00000002);
                 attributesBuilder_ = 
                   com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                     getAttributesFieldBuilder() : null;
+                     internalGetAttributesFieldBuilder() : null;
               } else {
                 attributesBuilder_.addAllMessages(other.attributes_);
               }
@@ -3403,7 +3404,7 @@ public Builder mergeFrom(org.tensorflow.proto.TrackableObjectGraphOuterClass.Tra
                 bitField0_ = (bitField0_ & ~0x00000004);
                 slotVariablesBuilder_ = 
                   com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                     getSlotVariablesFieldBuilder() : null;
+                     internalGetSlotVariablesFieldBuilder() : null;
               } else {
                 slotVariablesBuilder_.addAllMessages(other.slotVariables_);
               }
@@ -3482,14 +3483,14 @@ public Builder mergeFrom(
                 } // case 26
                 case 34: {
                   input.readMessage(
-                      getRegisteredSaverFieldBuilder().getBuilder(),
+                      internalGetRegisteredSaverFieldBuilder().getBuilder(),
                       extensionRegistry);
                   bitField0_ |= 0x00000008;
                   break;
                 } // case 34
                 case 42: {
                   input.readMessage(
-                      getHasCheckpointValuesFieldBuilder().getBuilder(),
+                      internalGetHasCheckpointValuesFieldBuilder().getBuilder(),
                       extensionRegistry);
                   bitField0_ |= 0x00000010;
                   break;
@@ -3743,7 +3744,7 @@ public Builder removeChildren(int index) {
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder getChildrenBuilder(
             int index) {
-          return getChildrenFieldBuilder().getBuilder(index);
+          return internalGetChildrenFieldBuilder().getBuilder(index);
         }
         /**
          * 
@@ -3782,7 +3783,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          * repeated .tensorflow.TrackableObjectGraph.TrackableObject.ObjectReference children = 1;
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder addChildrenBuilder() {
-          return getChildrenFieldBuilder().addBuilder(
+          return internalGetChildrenFieldBuilder().addBuilder(
               org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.getDefaultInstance());
         }
         /**
@@ -3794,7 +3795,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder addChildrenBuilder(
             int index) {
-          return getChildrenFieldBuilder().addBuilder(
+          return internalGetChildrenFieldBuilder().addBuilder(
               index, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.getDefaultInstance());
         }
         /**
@@ -3806,11 +3807,11 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          */
         public java.util.List 
              getChildrenBuilderList() {
-          return getChildrenFieldBuilder().getBuilderList();
+          return internalGetChildrenFieldBuilder().getBuilderList();
         }
         private com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReferenceOrBuilder> 
-            getChildrenFieldBuilder() {
+            internalGetChildrenFieldBuilder() {
           if (childrenBuilder_ == null) {
             childrenBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                 org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.ObjectReferenceOrBuilder>(
@@ -4055,7 +4056,7 @@ public Builder removeAttributes(int index) {
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor.Builder getAttributesBuilder(
             int index) {
-          return getAttributesFieldBuilder().getBuilder(index);
+          return internalGetAttributesFieldBuilder().getBuilder(index);
         }
         /**
          * 
@@ -4094,7 +4095,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          * repeated .tensorflow.TrackableObjectGraph.TrackableObject.SerializedTensor attributes = 2;
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor.Builder addAttributesBuilder() {
-          return getAttributesFieldBuilder().addBuilder(
+          return internalGetAttributesFieldBuilder().addBuilder(
               org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor.getDefaultInstance());
         }
         /**
@@ -4106,7 +4107,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor.Builder addAttributesBuilder(
             int index) {
-          return getAttributesFieldBuilder().addBuilder(
+          return internalGetAttributesFieldBuilder().addBuilder(
               index, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor.getDefaultInstance());
         }
         /**
@@ -4118,11 +4119,11 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          */
         public java.util.List 
              getAttributesBuilderList() {
-          return getAttributesFieldBuilder().getBuilderList();
+          return internalGetAttributesFieldBuilder().getBuilderList();
         }
         private com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensorOrBuilder> 
-            getAttributesFieldBuilder() {
+            internalGetAttributesFieldBuilder() {
           if (attributesBuilder_ == null) {
             attributesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                 org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensor.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SerializedTensorOrBuilder>(
@@ -4367,7 +4368,7 @@ public Builder removeSlotVariables(int index) {
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder getSlotVariablesBuilder(
             int index) {
-          return getSlotVariablesFieldBuilder().getBuilder(index);
+          return internalGetSlotVariablesFieldBuilder().getBuilder(index);
         }
         /**
          * 
@@ -4406,7 +4407,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          * repeated .tensorflow.TrackableObjectGraph.TrackableObject.SlotVariableReference slot_variables = 3;
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder addSlotVariablesBuilder() {
-          return getSlotVariablesFieldBuilder().addBuilder(
+          return internalGetSlotVariablesFieldBuilder().addBuilder(
               org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.getDefaultInstance());
         }
         /**
@@ -4418,7 +4419,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          */
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder addSlotVariablesBuilder(
             int index) {
-          return getSlotVariablesFieldBuilder().addBuilder(
+          return internalGetSlotVariablesFieldBuilder().addBuilder(
               index, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.getDefaultInstance());
         }
         /**
@@ -4430,11 +4431,11 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
          */
         public java.util.List 
              getSlotVariablesBuilderList() {
-          return getSlotVariablesFieldBuilder().getBuilderList();
+          return internalGetSlotVariablesFieldBuilder().getBuilderList();
         }
         private com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReferenceOrBuilder> 
-            getSlotVariablesFieldBuilder() {
+            internalGetSlotVariablesFieldBuilder() {
           if (slotVariablesBuilder_ == null) {
             slotVariablesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                 org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReference.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.SlotVariableReferenceOrBuilder>(
@@ -4573,7 +4574,7 @@ public Builder clearRegisteredSaver() {
         public org.tensorflow.proto.TrackableObjectGraphOuterClass.RegisteredSaver.Builder getRegisteredSaverBuilder() {
           bitField0_ |= 0x00000008;
           onChanged();
-          return getRegisteredSaverFieldBuilder().getBuilder();
+          return internalGetRegisteredSaverFieldBuilder().getBuilder();
         }
         /**
          * 
@@ -4601,7 +4602,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.RegisteredSaverOrBuil
          */
         private com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TrackableObjectGraphOuterClass.RegisteredSaver, org.tensorflow.proto.TrackableObjectGraphOuterClass.RegisteredSaver.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.RegisteredSaverOrBuilder> 
-            getRegisteredSaverFieldBuilder() {
+            internalGetRegisteredSaverFieldBuilder() {
           if (registeredSaverBuilder_ == null) {
             registeredSaverBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                 org.tensorflow.proto.TrackableObjectGraphOuterClass.RegisteredSaver, org.tensorflow.proto.TrackableObjectGraphOuterClass.RegisteredSaver.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.RegisteredSaverOrBuilder>(
@@ -4753,7 +4754,7 @@ public Builder clearHasCheckpointValues() {
         public com.google.protobuf.BoolValue.Builder getHasCheckpointValuesBuilder() {
           bitField0_ |= 0x00000010;
           onChanged();
-          return getHasCheckpointValuesFieldBuilder().getBuilder();
+          return internalGetHasCheckpointValuesFieldBuilder().getBuilder();
         }
         /**
          * 
@@ -4785,7 +4786,7 @@ public com.google.protobuf.BoolValueOrBuilder getHasCheckpointValuesOrBuilder()
          */
         private com.google.protobuf.SingleFieldBuilder<
             com.google.protobuf.BoolValue, com.google.protobuf.BoolValue.Builder, com.google.protobuf.BoolValueOrBuilder> 
-            getHasCheckpointValuesFieldBuilder() {
+            internalGetHasCheckpointValuesFieldBuilder() {
           if (hasCheckpointValuesBuilder_ == null) {
             hasCheckpointValuesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                 com.google.protobuf.BoolValue, com.google.protobuf.BoolValue.Builder, com.google.protobuf.BoolValueOrBuilder>(
@@ -5169,7 +5170,7 @@ public Builder mergeFrom(org.tensorflow.proto.TrackableObjectGraphOuterClass.Tra
               bitField0_ = (bitField0_ & ~0x00000001);
               nodesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getNodesFieldBuilder() : null;
+                   internalGetNodesFieldBuilder() : null;
             } else {
               nodesBuilder_.addAllMessages(other.nodes_);
             }
@@ -5411,7 +5412,7 @@ public Builder removeNodes(int index) {
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.Builder getNodesBuilder(
           int index) {
-        return getNodesFieldBuilder().getBuilder(index);
+        return internalGetNodesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.TrackableObjectGraph.TrackableObject nodes = 1;
@@ -5438,7 +5439,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        * repeated .tensorflow.TrackableObjectGraph.TrackableObject nodes = 1;
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.Builder addNodesBuilder() {
-        return getNodesFieldBuilder().addBuilder(
+        return internalGetNodesFieldBuilder().addBuilder(
             org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.getDefaultInstance());
       }
       /**
@@ -5446,7 +5447,7 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        */
       public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.Builder addNodesBuilder(
           int index) {
-        return getNodesFieldBuilder().addBuilder(
+        return internalGetNodesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.getDefaultInstance());
       }
       /**
@@ -5454,11 +5455,11 @@ public org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.
        */
       public java.util.List 
            getNodesBuilderList() {
-        return getNodesFieldBuilder().getBuilderList();
+        return internalGetNodesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObjectOrBuilder> 
-          getNodesFieldBuilder() {
+          internalGetNodesFieldBuilder() {
         if (nodesBuilder_ == null) {
           nodesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObject.Builder, org.tensorflow.proto.TrackableObjectGraphOuterClass.TrackableObjectGraph.TrackableObjectOrBuilder>(
@@ -5578,8 +5579,8 @@ public static final class RegisteredSaver extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         RegisteredSaver.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TransportOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TransportOptions.java
index 6f2d3dbb71d..8f67cda0582 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TransportOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TransportOptions.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/transport_options.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TransportOptions {
   private TransportOptions() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TransportOptions.class.getName());
   }
@@ -62,8 +63,8 @@ public static final class RecvBufRespExtra extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         RecvBufRespExtra.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TypesProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TypesProtos.java
index 262c275afad..59cba392efa 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TypesProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/TypesProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/types.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class TypesProtos {
   private TypesProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TypesProtos.class.getName());
   }
@@ -41,7 +42,7 @@ public static void registerAllExtensions(
     java.lang.String[] descriptorData = {
       "\n%tensorflow/core/framework/types.proto\022" +
       "\ntensorflow\"9\n\017SerializedDType\022&\n\010dataty" +
-      "pe\030\001 \001(\0162\024.tensorflow.DataType*\251\t\n\010DataT" +
+      "pe\030\001 \001(\0162\024.tensorflow.DataType*\332\t\n\010DataT" +
       "ype\022\016\n\nDT_INVALID\020\000\022\014\n\010DT_FLOAT\020\001\022\r\n\tDT_" +
       "DOUBLE\020\002\022\014\n\010DT_INT32\020\003\022\014\n\010DT_UINT8\020\004\022\014\n\010" +
       "DT_INT16\020\005\022\013\n\007DT_INT8\020\006\022\r\n\tDT_STRING\020\007\022\020" +
@@ -55,26 +56,28 @@ public static void registerAllExtensions(
       "4M3FN\020\031\022\026\n\022DT_FLOAT8_E4M3FNUZ\020\032\022\031\n\025DT_FL" +
       "OAT8_E4M3B11FNUZ\020\033\022\026\n\022DT_FLOAT8_E5M2FNUZ" +
       "\020\034\022\013\n\007DT_INT4\020\035\022\014\n\010DT_UINT4\020\036\022\013\n\007DT_INT2" +
-      "\020\037\022\014\n\010DT_UINT2\020 \022\020\n\014DT_FLOAT_REF\020e\022\021\n\rDT" +
-      "_DOUBLE_REF\020f\022\020\n\014DT_INT32_REF\020g\022\020\n\014DT_UI" +
-      "NT8_REF\020h\022\020\n\014DT_INT16_REF\020i\022\017\n\013DT_INT8_R" +
-      "EF\020j\022\021\n\rDT_STRING_REF\020k\022\024\n\020DT_COMPLEX64_" +
-      "REF\020l\022\020\n\014DT_INT64_REF\020m\022\017\n\013DT_BOOL_REF\020n" +
-      "\022\020\n\014DT_QINT8_REF\020o\022\021\n\rDT_QUINT8_REF\020p\022\021\n" +
-      "\rDT_QINT32_REF\020q\022\023\n\017DT_BFLOAT16_REF\020r\022\021\n" +
-      "\rDT_QINT16_REF\020s\022\022\n\016DT_QUINT16_REF\020t\022\021\n\r" +
-      "DT_UINT16_REF\020u\022\025\n\021DT_COMPLEX128_REF\020v\022\017" +
-      "\n\013DT_HALF_REF\020w\022\023\n\017DT_RESOURCE_REF\020x\022\022\n\016" +
-      "DT_VARIANT_REF\020y\022\021\n\rDT_UINT32_REF\020z\022\021\n\rD" +
-      "T_UINT64_REF\020{\022\026\n\022DT_FLOAT8_E5M2_REF\020|\022\030" +
-      "\n\024DT_FLOAT8_E4M3FN_REF\020}\022\032\n\026DT_FLOAT8_E4" +
-      "M3FNUZ_REF\020~\022\035\n\031DT_FLOAT8_E4M3B11FNUZ_RE" +
-      "F\020\177\022\033\n\026DT_FLOAT8_E5M2FNUZ_REF\020\200\001\022\020\n\013DT_I" +
-      "NT4_REF\020\201\001\022\021\n\014DT_UINT4_REF\020\202\001\022\020\n\013DT_INT2" +
-      "_REF\020\203\001\022\021\n\014DT_UINT2_REF\020\204\001Bv\n\024org.tensor" +
-      "flow.protoB\013TypesProtosP\001ZLgithub.com/te" +
-      "nsorflow/tensorflow/tensorflow/go/core/f" +
-      "ramework/types_go_proto\370\001\001b\006proto3"
+      "\020\037\022\014\n\010DT_UINT2\020 \022\024\n\020DT_FLOAT4_E2M1FN\020!\022\020" +
+      "\n\014DT_FLOAT_REF\020e\022\021\n\rDT_DOUBLE_REF\020f\022\020\n\014D" +
+      "T_INT32_REF\020g\022\020\n\014DT_UINT8_REF\020h\022\020\n\014DT_IN" +
+      "T16_REF\020i\022\017\n\013DT_INT8_REF\020j\022\021\n\rDT_STRING_" +
+      "REF\020k\022\024\n\020DT_COMPLEX64_REF\020l\022\020\n\014DT_INT64_" +
+      "REF\020m\022\017\n\013DT_BOOL_REF\020n\022\020\n\014DT_QINT8_REF\020o" +
+      "\022\021\n\rDT_QUINT8_REF\020p\022\021\n\rDT_QINT32_REF\020q\022\023" +
+      "\n\017DT_BFLOAT16_REF\020r\022\021\n\rDT_QINT16_REF\020s\022\022" +
+      "\n\016DT_QUINT16_REF\020t\022\021\n\rDT_UINT16_REF\020u\022\025\n" +
+      "\021DT_COMPLEX128_REF\020v\022\017\n\013DT_HALF_REF\020w\022\023\n" +
+      "\017DT_RESOURCE_REF\020x\022\022\n\016DT_VARIANT_REF\020y\022\021" +
+      "\n\rDT_UINT32_REF\020z\022\021\n\rDT_UINT64_REF\020{\022\026\n\022" +
+      "DT_FLOAT8_E5M2_REF\020|\022\030\n\024DT_FLOAT8_E4M3FN" +
+      "_REF\020}\022\032\n\026DT_FLOAT8_E4M3FNUZ_REF\020~\022\035\n\031DT" +
+      "_FLOAT8_E4M3B11FNUZ_REF\020\177\022\033\n\026DT_FLOAT8_E" +
+      "5M2FNUZ_REF\020\200\001\022\020\n\013DT_INT4_REF\020\201\001\022\021\n\014DT_U" +
+      "INT4_REF\020\202\001\022\020\n\013DT_INT2_REF\020\203\001\022\021\n\014DT_UINT" +
+      "2_REF\020\204\001\022\031\n\024DT_FLOAT4_E2M1FN_REF\020\205\001Bv\n\024o" +
+      "rg.tensorflow.protoB\013TypesProtosP\001ZLgith" +
+      "ub.com/tensorflow/tensorflow/tensorflow/" +
+      "go/core/framework/types_go_proto\370\001\001b\006pro" +
+      "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/UniformQuantOpsAttr.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/UniformQuantOpsAttr.java
index 91595e4d9c8..cc7b31ec2ae 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/UniformQuantOpsAttr.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/UniformQuantOpsAttr.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/quantization/uniform_quant_ops_attr.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class UniformQuantOpsAttr {
   private UniformQuantOpsAttr() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       UniformQuantOpsAttr.class.getName());
   }
@@ -202,8 +203,8 @@ public static final class UniformQuantizedConvolutionDimensionNumbersAttr extend
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         UniformQuantizedConvolutionDimensionNumbersAttr.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ValuesDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ValuesDef.java
index 6245af89c8c..e099426eeb0 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ValuesDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ValuesDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.ValuesDef}
  */
+@com.google.protobuf.Generated
 public final class ValuesDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.ValuesDef)
@@ -21,8 +22,8 @@ public final class ValuesDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ValuesDef.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ValuesDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ValuesDefOrBuilder.java
index a664cecce7c..10be83b3e0b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ValuesDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/ValuesDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface ValuesDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.ValuesDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VarLenFeatureProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VarLenFeatureProto.java
index 15f8a3ade51..02e932de3e1 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VarLenFeatureProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VarLenFeatureProto.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.VarLenFeatureProto}
  */
+@com.google.protobuf.Generated
 public final class VarLenFeatureProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.VarLenFeatureProto)
@@ -17,8 +18,8 @@ public final class VarLenFeatureProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VarLenFeatureProto.class.getName());
   }
@@ -579,9 +580,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       dtype_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VarLenFeatureProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VarLenFeatureProtoOrBuilder.java
index dfd0c8e932d..5943d90f83f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VarLenFeatureProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VarLenFeatureProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/example/example_parser_configuration.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface VarLenFeatureProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.VarLenFeatureProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableAggregation.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableAggregation.java
index 1b2f657469d..afe1af2dbc6 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableAggregation.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableAggregation.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/variable.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf enum {@code tensorflow.VariableAggregation}
  */
+@com.google.protobuf.Generated
 public enum VariableAggregation
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -57,8 +58,8 @@ public enum VariableAggregation
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VariableAggregation.class.getName());
   }
@@ -156,7 +157,7 @@ public VariableAggregation findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.VariableProtos.getDescriptor().getEnumTypes().get(1);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableDef.java
index 05fa166a1a0..306965f9a79 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/variable.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.VariableDef}
  */
+@com.google.protobuf.Generated
 public final class VariableDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.VariableDef)
@@ -21,8 +22,8 @@ public final class VariableDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VariableDef.class.getName());
   }
@@ -644,7 +645,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getSaveSliceInfoDefFieldBuilder();
+        internalGetSaveSliceInfoDefFieldBuilder();
       }
     }
     @java.lang.Override
@@ -821,7 +822,7 @@ public Builder mergeFrom(
             } // case 26
             case 34: {
               input.readMessage(
-                  getSaveSliceInfoDefFieldBuilder().getBuilder(),
+                  internalGetSaveSliceInfoDefFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000010;
               break;
@@ -1355,7 +1356,7 @@ public Builder clearSaveSliceInfoDef() {
     public org.tensorflow.proto.SaveSliceInfoDef.Builder getSaveSliceInfoDefBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
-      return getSaveSliceInfoDefFieldBuilder().getBuilder();
+      return internalGetSaveSliceInfoDefFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -1381,7 +1382,7 @@ public org.tensorflow.proto.SaveSliceInfoDefOrBuilder getSaveSliceInfoDefOrBuild
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.SaveSliceInfoDef, org.tensorflow.proto.SaveSliceInfoDef.Builder, org.tensorflow.proto.SaveSliceInfoDefOrBuilder> 
-        getSaveSliceInfoDefFieldBuilder() {
+        internalGetSaveSliceInfoDefFieldBuilder() {
       if (saveSliceInfoDefBuilder_ == null) {
         saveSliceInfoDefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.SaveSliceInfoDef, org.tensorflow.proto.SaveSliceInfoDef.Builder, org.tensorflow.proto.SaveSliceInfoDefOrBuilder>(
@@ -1531,9 +1532,7 @@ public org.tensorflow.proto.VariableSynchronization getSynchronization() {
      * @return This builder for chaining.
      */
     public Builder setSynchronization(org.tensorflow.proto.VariableSynchronization value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000080;
       synchronization_ = value.getNumber();
       onChanged();
@@ -1604,9 +1603,7 @@ public org.tensorflow.proto.VariableAggregation getAggregation() {
      * @return This builder for chaining.
      */
     public Builder setAggregation(org.tensorflow.proto.VariableAggregation value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000100;
       aggregation_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableDefOrBuilder.java
index c21be5ee951..0c431defece 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/variable.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface VariableDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.VariableDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableProtos.java
index 0fcca6df742..e6454b6baf0 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/variable.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class VariableProtos {
   private VariableProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VariableProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableSynchronization.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableSynchronization.java
index 3a618d402ac..ac4a0286826 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableSynchronization.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariableSynchronization.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/variable.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf enum {@code tensorflow.VariableSynchronization}
  */
+@com.google.protobuf.Generated
 public enum VariableSynchronization
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -59,8 +60,8 @@ public enum VariableSynchronization
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VariableSynchronization.class.getName());
   }
@@ -160,7 +161,7 @@ public VariableSynchronization findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.VariableProtos.getDescriptor().getEnumTypes().get(0);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariantTensorDataProto.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariantTensorDataProto.java
index 50181e54d12..79cee5ba7f7 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariantTensorDataProto.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariantTensorDataProto.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.VariantTensorDataProto}
  */
+@com.google.protobuf.Generated
 public final class VariantTensorDataProto extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.VariantTensorDataProto)
@@ -21,8 +22,8 @@ public final class VariantTensorDataProto extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VariantTensorDataProto.class.getName());
   }
@@ -470,7 +471,7 @@ public Builder mergeFrom(org.tensorflow.proto.VariantTensorDataProto other) {
         bitField0_ |= 0x00000001;
         onChanged();
       }
-      if (other.getMetadata() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getMetadata().isEmpty()) {
         setMetadata(other.getMetadata());
       }
       if (tensorsBuilder_ == null) {
@@ -493,7 +494,7 @@ public Builder mergeFrom(org.tensorflow.proto.VariantTensorDataProto other) {
             bitField0_ = (bitField0_ & ~0x00000004);
             tensorsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getTensorsFieldBuilder() : null;
+                 internalGetTensorsFieldBuilder() : null;
           } else {
             tensorsBuilder_.addAllMessages(other.tensors_);
           }
@@ -933,7 +934,7 @@ public Builder removeTensors(int index) {
      */
     public org.tensorflow.proto.TensorProto.Builder getTensorsBuilder(
         int index) {
-      return getTensorsFieldBuilder().getBuilder(index);
+      return internalGetTensorsFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -972,7 +973,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorsOrBuilder(
      * repeated .tensorflow.TensorProto tensors = 3;
      */
     public org.tensorflow.proto.TensorProto.Builder addTensorsBuilder() {
-      return getTensorsFieldBuilder().addBuilder(
+      return internalGetTensorsFieldBuilder().addBuilder(
           org.tensorflow.proto.TensorProto.getDefaultInstance());
     }
     /**
@@ -984,7 +985,7 @@ public org.tensorflow.proto.TensorProto.Builder addTensorsBuilder() {
      */
     public org.tensorflow.proto.TensorProto.Builder addTensorsBuilder(
         int index) {
-      return getTensorsFieldBuilder().addBuilder(
+      return internalGetTensorsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.TensorProto.getDefaultInstance());
     }
     /**
@@ -996,11 +997,11 @@ public org.tensorflow.proto.TensorProto.Builder addTensorsBuilder(
      */
     public java.util.List 
          getTensorsBuilderList() {
-      return getTensorsFieldBuilder().getBuilderList();
+      return internalGetTensorsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-        getTensorsFieldBuilder() {
+        internalGetTensorsFieldBuilder() {
       if (tensorsBuilder_ == null) {
         tensorsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariantTensorDataProtoOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariantTensorDataProtoOrBuilder.java
index 35d2a7a341b..10c26d16de8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariantTensorDataProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VariantTensorDataProtoOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/tensor.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface VariantTensorDataProtoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.VariantTensorDataProto)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfig.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfig.java
index c505dd32bab..35959c5be18 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfig.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfig.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/verifier_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.VerifierConfig}
  */
+@com.google.protobuf.Generated
 public final class VerifierConfig extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.VerifierConfig)
@@ -21,8 +22,8 @@ public final class VerifierConfig extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VerifierConfig.class.getName());
   }
@@ -71,8 +72,8 @@ public enum Toggle
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Toggle.class.getName());
     }
@@ -145,7 +146,7 @@ public Toggle findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.VerifierConfig.getDescriptor().getEnumTypes().get(0);
     }
@@ -632,9 +633,7 @@ public org.tensorflow.proto.VerifierConfig.Toggle getStructureVerifier() {
      * @return This builder for chaining.
      */
     public Builder setStructureVerifier(org.tensorflow.proto.VerifierConfig.Toggle value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000002;
       structureVerifier_ = value.getNumber();
       onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfigOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfigOrBuilder.java
index 73d458cfcba..5d65c2efa74 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfigOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfigOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/verifier_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface VerifierConfigOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.VerifierConfig)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfigProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfigProtos.java
index 90bb0857380..545f83f98df 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfigProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VerifierConfigProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/verifier_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class VerifierConfigProtos {
   private VerifierConfigProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VerifierConfigProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionDef.java
index b9d81a5d931..310cf0152ea 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/versions.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -23,6 +23,7 @@
  *
  * Protobuf type {@code tensorflow.VersionDef}
  */
+@com.google.protobuf.Generated
 public final class VersionDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.VersionDef)
@@ -32,8 +33,8 @@ public final class VersionDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VersionDef.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionDefOrBuilder.java
index 46a49c23fd2..148c52854e7 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/versions.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface VersionDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.VersionDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionsProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionsProtos.java
index 4ab034a3ac6..5680bc42783 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionsProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/VersionsProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/versions.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public final class VersionsProtos {
   private VersionsProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       VersionsProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WatchdogConfig.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WatchdogConfig.java
index af3277bb62a..3e3655d4e0a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WatchdogConfig.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WatchdogConfig.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.WatchdogConfig}
  */
+@com.google.protobuf.Generated
 public final class WatchdogConfig extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.WatchdogConfig)
@@ -17,8 +18,8 @@ public final class WatchdogConfig extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WatchdogConfig.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WatchdogConfigOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WatchdogConfigOrBuilder.java
index 8f35890f360..09f61146db5 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WatchdogConfigOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WatchdogConfigOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface WatchdogConfigOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.WatchdogConfig)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WhileContextDef.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WhileContextDef.java
index dde2953f58a..444fa8ac23a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WhileContextDef.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WhileContextDef.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf type {@code tensorflow.WhileContextDef}
  */
+@com.google.protobuf.Generated
 public final class WhileContextDef extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.WhileContextDef)
@@ -21,8 +22,8 @@ public final class WhileContextDef extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WhileContextDef.class.getName());
   }
@@ -873,8 +874,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getValuesDefFieldBuilder();
-        getNestedContextsFieldBuilder();
+        internalGetValuesDefFieldBuilder();
+        internalGetNestedContextsFieldBuilder();
       }
     }
     @java.lang.Override
@@ -1082,7 +1083,7 @@ public Builder mergeFrom(org.tensorflow.proto.WhileContextDef other) {
             bitField0_ = (bitField0_ & ~0x00000800);
             nestedContextsBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getNestedContextsFieldBuilder() : null;
+                 internalGetNestedContextsFieldBuilder() : null;
           } else {
             nestedContextsBuilder_.addAllMessages(other.nestedContexts_);
           }
@@ -1157,7 +1158,7 @@ public Builder mergeFrom(
             } // case 66
             case 74: {
               input.readMessage(
-                  getValuesDefFieldBuilder().getBuilder(),
+                  internalGetValuesDefFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000200;
               break;
@@ -2116,7 +2117,7 @@ public Builder clearValuesDef() {
     public org.tensorflow.proto.ValuesDef.Builder getValuesDefBuilder() {
       bitField0_ |= 0x00000200;
       onChanged();
-      return getValuesDefFieldBuilder().getBuilder();
+      return internalGetValuesDefFieldBuilder().getBuilder();
     }
     /**
      * 
@@ -2142,7 +2143,7 @@ public org.tensorflow.proto.ValuesDefOrBuilder getValuesDefOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.ValuesDef, org.tensorflow.proto.ValuesDef.Builder, org.tensorflow.proto.ValuesDefOrBuilder> 
-        getValuesDefFieldBuilder() {
+        internalGetValuesDefFieldBuilder() {
       if (valuesDefBuilder_ == null) {
         valuesDefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.ValuesDef, org.tensorflow.proto.ValuesDef.Builder, org.tensorflow.proto.ValuesDefOrBuilder>(
@@ -2478,7 +2479,7 @@ public Builder removeNestedContexts(int index) {
      */
     public org.tensorflow.proto.ControlFlowContextDef.Builder getNestedContextsBuilder(
         int index) {
-      return getNestedContextsFieldBuilder().getBuilder(index);
+      return internalGetNestedContextsFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -2517,7 +2518,7 @@ public org.tensorflow.proto.ControlFlowContextDefOrBuilder getNestedContextsOrBu
      * repeated .tensorflow.ControlFlowContextDef nested_contexts = 12;
      */
     public org.tensorflow.proto.ControlFlowContextDef.Builder addNestedContextsBuilder() {
-      return getNestedContextsFieldBuilder().addBuilder(
+      return internalGetNestedContextsFieldBuilder().addBuilder(
           org.tensorflow.proto.ControlFlowContextDef.getDefaultInstance());
     }
     /**
@@ -2529,7 +2530,7 @@ public org.tensorflow.proto.ControlFlowContextDef.Builder addNestedContextsBuild
      */
     public org.tensorflow.proto.ControlFlowContextDef.Builder addNestedContextsBuilder(
         int index) {
-      return getNestedContextsFieldBuilder().addBuilder(
+      return internalGetNestedContextsFieldBuilder().addBuilder(
           index, org.tensorflow.proto.ControlFlowContextDef.getDefaultInstance());
     }
     /**
@@ -2541,11 +2542,11 @@ public org.tensorflow.proto.ControlFlowContextDef.Builder addNestedContextsBuild
      */
     public java.util.List 
          getNestedContextsBuilderList() {
-      return getNestedContextsFieldBuilder().getBuilderList();
+      return internalGetNestedContextsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.ControlFlowContextDef, org.tensorflow.proto.ControlFlowContextDef.Builder, org.tensorflow.proto.ControlFlowContextDefOrBuilder> 
-        getNestedContextsFieldBuilder() {
+        internalGetNestedContextsFieldBuilder() {
       if (nestedContextsBuilder_ == null) {
         nestedContextsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.ControlFlowContextDef, org.tensorflow.proto.ControlFlowContextDef.Builder, org.tensorflow.proto.ControlFlowContextDefOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WhileContextDefOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WhileContextDefOrBuilder.java
index 1a2e27ced0e..c1bcab53658 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WhileContextDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WhileContextDefOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/control_flow.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface WhileContextDefOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.WhileContextDef)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHealth.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHealth.java
index 842c0e8ac3a..960ffd45905 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHealth.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHealth.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -12,6 +12,7 @@
  *
  * Protobuf enum {@code tensorflow.WorkerHealth}
  */
+@com.google.protobuf.Generated
 public enum WorkerHealth
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -45,8 +46,8 @@ public enum WorkerHealth
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WorkerHealth.class.getName());
   }
@@ -132,7 +133,7 @@ public WorkerHealth findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.EventProtos.getDescriptor().getEnumTypes().get(0);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatRequest.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatRequest.java
index 6459105c36b..d4eb44883a3 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatRequest.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatRequest.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.WorkerHeartbeatRequest}
  */
+@com.google.protobuf.Generated
 public final class WorkerHeartbeatRequest extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.WorkerHeartbeatRequest)
@@ -17,8 +18,8 @@ public final class WorkerHeartbeatRequest extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WorkerHeartbeatRequest.class.getName());
   }
@@ -335,8 +336,8 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getWatchdogConfigFieldBuilder();
-        getExitCodeFieldBuilder();
+        internalGetWatchdogConfigFieldBuilder();
+        internalGetExitCodeFieldBuilder();
       }
     }
     @java.lang.Override
@@ -460,14 +461,14 @@ public Builder mergeFrom(
             } // case 8
             case 18: {
               input.readMessage(
-                  getWatchdogConfigFieldBuilder().getBuilder(),
+                  internalGetWatchdogConfigFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
             } // case 18
             case 26: {
               input.readMessage(
-                  getExitCodeFieldBuilder().getBuilder(),
+                  internalGetExitCodeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000004;
               break;
@@ -523,9 +524,7 @@ public org.tensorflow.proto.WorkerShutdownMode getShutdownMode() {
      * @return This builder for chaining.
      */
     public Builder setShutdownMode(org.tensorflow.proto.WorkerShutdownMode value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       shutdownMode_ = value.getNumber();
       onChanged();
@@ -633,7 +632,7 @@ public Builder clearWatchdogConfig() {
     public org.tensorflow.proto.WatchdogConfig.Builder getWatchdogConfigBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getWatchdogConfigFieldBuilder().getBuilder();
+      return internalGetWatchdogConfigFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.WatchdogConfig watchdog_config = 2;
@@ -651,7 +650,7 @@ public org.tensorflow.proto.WatchdogConfigOrBuilder getWatchdogConfigOrBuilder()
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.WatchdogConfig, org.tensorflow.proto.WatchdogConfig.Builder, org.tensorflow.proto.WatchdogConfigOrBuilder> 
-        getWatchdogConfigFieldBuilder() {
+        internalGetWatchdogConfigFieldBuilder() {
       if (watchdogConfigBuilder_ == null) {
         watchdogConfigBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.WatchdogConfig, org.tensorflow.proto.WatchdogConfig.Builder, org.tensorflow.proto.WatchdogConfigOrBuilder>(
@@ -754,7 +753,7 @@ public Builder clearExitCode() {
     public org.tensorflow.proto.RequestedExitCode.Builder getExitCodeBuilder() {
       bitField0_ |= 0x00000004;
       onChanged();
-      return getExitCodeFieldBuilder().getBuilder();
+      return internalGetExitCodeFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.RequestedExitCode exit_code = 3;
@@ -772,7 +771,7 @@ public org.tensorflow.proto.RequestedExitCodeOrBuilder getExitCodeOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.RequestedExitCode, org.tensorflow.proto.RequestedExitCode.Builder, org.tensorflow.proto.RequestedExitCodeOrBuilder> 
-        getExitCodeFieldBuilder() {
+        internalGetExitCodeFieldBuilder() {
       if (exitCodeBuilder_ == null) {
         exitCodeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.RequestedExitCode, org.tensorflow.proto.RequestedExitCode.Builder, org.tensorflow.proto.RequestedExitCodeOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatRequestOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatRequestOrBuilder.java
index c6acadaba4d..ef02bdf14fd 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatRequestOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatRequestOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface WorkerHeartbeatRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.WorkerHeartbeatRequest)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatResponse.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatResponse.java
index fcaeeb0419c..94864762479 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatResponse.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatResponse.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
 /**
  * Protobuf type {@code tensorflow.WorkerHeartbeatResponse}
  */
+@com.google.protobuf.Generated
 public final class WorkerHeartbeatResponse extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.WorkerHeartbeatResponse)
@@ -17,8 +18,8 @@ public final class WorkerHeartbeatResponse extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WorkerHeartbeatResponse.class.getName());
   }
@@ -454,7 +455,7 @@ public Builder mergeFrom(org.tensorflow.proto.WorkerHeartbeatResponse other) {
             bitField0_ = (bitField0_ & ~0x00000002);
             workerLogBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getWorkerLogFieldBuilder() : null;
+                 internalGetWorkerLogFieldBuilder() : null;
           } else {
             workerLogBuilder_.addAllMessages(other.workerLog_);
           }
@@ -565,9 +566,7 @@ public org.tensorflow.proto.WorkerHealth getHealthStatus() {
      * @return This builder for chaining.
      */
     public Builder setHealthStatus(org.tensorflow.proto.WorkerHealth value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       healthStatus_ = value.getNumber();
       onChanged();
@@ -764,7 +763,7 @@ public Builder removeWorkerLog(int index) {
      */
     public org.tensorflow.proto.Event.Builder getWorkerLogBuilder(
         int index) {
-      return getWorkerLogFieldBuilder().getBuilder(index);
+      return internalGetWorkerLogFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tensorflow.Event worker_log = 2;
@@ -791,7 +790,7 @@ public org.tensorflow.proto.EventOrBuilder getWorkerLogOrBuilder(
      * repeated .tensorflow.Event worker_log = 2;
      */
     public org.tensorflow.proto.Event.Builder addWorkerLogBuilder() {
-      return getWorkerLogFieldBuilder().addBuilder(
+      return internalGetWorkerLogFieldBuilder().addBuilder(
           org.tensorflow.proto.Event.getDefaultInstance());
     }
     /**
@@ -799,7 +798,7 @@ public org.tensorflow.proto.Event.Builder addWorkerLogBuilder() {
      */
     public org.tensorflow.proto.Event.Builder addWorkerLogBuilder(
         int index) {
-      return getWorkerLogFieldBuilder().addBuilder(
+      return internalGetWorkerLogFieldBuilder().addBuilder(
           index, org.tensorflow.proto.Event.getDefaultInstance());
     }
     /**
@@ -807,11 +806,11 @@ public org.tensorflow.proto.Event.Builder addWorkerLogBuilder(
      */
     public java.util.List 
          getWorkerLogBuilderList() {
-      return getWorkerLogFieldBuilder().getBuilderList();
+      return internalGetWorkerLogFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.Event, org.tensorflow.proto.Event.Builder, org.tensorflow.proto.EventOrBuilder> 
-        getWorkerLogFieldBuilder() {
+        internalGetWorkerLogFieldBuilder() {
       if (workerLogBuilder_ == null) {
         workerLogBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.Event, org.tensorflow.proto.Event.Builder, org.tensorflow.proto.EventOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatResponseOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatResponseOrBuilder.java
index e3265649d84..2c68d7b604d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatResponseOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerHeartbeatResponseOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
+@com.google.protobuf.Generated
 public interface WorkerHeartbeatResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.WorkerHeartbeatResponse)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerShutdownMode.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerShutdownMode.java
index 13ac914fc60..83ab55e4b52 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerShutdownMode.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/WorkerShutdownMode.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/event.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto;
 
@@ -13,6 +13,7 @@
  *
  * Protobuf enum {@code tensorflow.WorkerShutdownMode}
  */
+@com.google.protobuf.Generated
 public enum WorkerShutdownMode
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -38,8 +39,8 @@ public enum WorkerShutdownMode
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WorkerShutdownMode.class.getName());
   }
@@ -117,7 +118,7 @@ public WorkerShutdownMode findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.EventProtos.getDescriptor().getEnumTypes().get(1);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/core/CppShapeInference.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/core/CppShapeInference.java
index 4e2e3d02615..501d1a1ce4d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/core/CppShapeInference.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/core/CppShapeInference.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/cpp_shape_inference.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.core;
 
+@com.google.protobuf.Generated
 public final class CppShapeInference {
   private CppShapeInference() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CppShapeInference.class.getName());
   }
@@ -71,8 +72,8 @@ public static final class CppShapeInferenceResult extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CppShapeInferenceResult.class.getName());
     }
@@ -153,8 +154,8 @@ public static final class HandleShapeAndType extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           HandleShapeAndType.class.getName());
       }
@@ -471,8 +472,8 @@ private Builder(
         private void maybeForceBuilderInitialization() {
           if (com.google.protobuf.GeneratedMessage
                   .alwaysUseFieldBuilders) {
-            getShapeFieldBuilder();
-            getTypeFieldBuilder();
+            internalGetShapeFieldBuilder();
+            internalGetTypeFieldBuilder();
           }
         }
         @java.lang.Override
@@ -591,7 +592,7 @@ public Builder mergeFrom(
                   break;
                 case 10: {
                   input.readMessage(
-                      getShapeFieldBuilder().getBuilder(),
+                      internalGetShapeFieldBuilder().getBuilder(),
                       extensionRegistry);
                   bitField0_ |= 0x00000001;
                   break;
@@ -603,7 +604,7 @@ public Builder mergeFrom(
                 } // case 16
                 case 34: {
                   input.readMessage(
-                      getTypeFieldBuilder().getBuilder(),
+                      internalGetTypeFieldBuilder().getBuilder(),
                       extensionRegistry);
                   bitField0_ |= 0x00000004;
                   break;
@@ -716,7 +717,7 @@ public Builder clearShape() {
         public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
           bitField0_ |= 0x00000001;
           onChanged();
-          return getShapeFieldBuilder().getBuilder();
+          return internalGetShapeFieldBuilder().getBuilder();
         }
         /**
          * .tensorflow.TensorShapeProto shape = 1;
@@ -734,7 +735,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
          */
         private com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-            getShapeFieldBuilder() {
+            internalGetShapeFieldBuilder() {
           if (shapeBuilder_ == null) {
             shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                 org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -780,9 +781,7 @@ public org.tensorflow.proto.DataType getDtype() {
          * @return This builder for chaining.
          */
         public Builder setDtype(org.tensorflow.proto.DataType value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00000002;
           dtype_ = value.getNumber();
           onChanged();
@@ -890,7 +889,7 @@ public Builder clearType() {
         public org.tensorflow.proto.FullTypeDef.Builder getTypeBuilder() {
           bitField0_ |= 0x00000004;
           onChanged();
-          return getTypeFieldBuilder().getBuilder();
+          return internalGetTypeFieldBuilder().getBuilder();
         }
         /**
          * .tensorflow.FullTypeDef type = 4;
@@ -908,7 +907,7 @@ public org.tensorflow.proto.FullTypeDefOrBuilder getTypeOrBuilder() {
          */
         private com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.FullTypeDef, org.tensorflow.proto.FullTypeDef.Builder, org.tensorflow.proto.FullTypeDefOrBuilder> 
-            getTypeFieldBuilder() {
+            internalGetTypeFieldBuilder() {
           if (typeBuilder_ == null) {
             typeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                 org.tensorflow.proto.FullTypeDef, org.tensorflow.proto.FullTypeDef.Builder, org.tensorflow.proto.FullTypeDefOrBuilder>(
@@ -1037,8 +1036,8 @@ public static final class HandleData extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           HandleData.class.getName());
       }
@@ -1434,7 +1433,7 @@ public Builder mergeFrom(org.tensorflow.proto.core.CppShapeInference.CppShapeInf
                 bitField0_ = (bitField0_ & ~0x00000002);
                 shapeAndTypeBuilder_ = 
                   com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                     getShapeAndTypeFieldBuilder() : null;
+                     internalGetShapeAndTypeFieldBuilder() : null;
               } else {
                 shapeAndTypeBuilder_.addAllMessages(other.shapeAndType_);
               }
@@ -1765,7 +1764,7 @@ public Builder removeShapeAndType(int index) {
          */
         public org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType.Builder getShapeAndTypeBuilder(
             int index) {
-          return getShapeAndTypeFieldBuilder().getBuilder(index);
+          return internalGetShapeAndTypeFieldBuilder().getBuilder(index);
         }
         /**
          * 
@@ -1804,7 +1803,7 @@ public org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.Handl
          * repeated .tensorflow.core.CppShapeInferenceResult.HandleShapeAndType shape_and_type = 2;
          */
         public org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType.Builder addShapeAndTypeBuilder() {
-          return getShapeAndTypeFieldBuilder().addBuilder(
+          return internalGetShapeAndTypeFieldBuilder().addBuilder(
               org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType.getDefaultInstance());
         }
         /**
@@ -1816,7 +1815,7 @@ public org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.Handl
          */
         public org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType.Builder addShapeAndTypeBuilder(
             int index) {
-          return getShapeAndTypeFieldBuilder().addBuilder(
+          return internalGetShapeAndTypeFieldBuilder().addBuilder(
               index, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType.getDefaultInstance());
         }
         /**
@@ -1828,11 +1827,11 @@ public org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.Handl
          */
         public java.util.List 
              getShapeAndTypeBuilderList() {
-          return getShapeAndTypeFieldBuilder().getBuilderList();
+          return internalGetShapeAndTypeFieldBuilder().getBuilderList();
         }
         private com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType.Builder, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndTypeOrBuilder> 
-            getShapeAndTypeFieldBuilder() {
+            internalGetShapeAndTypeFieldBuilder() {
           if (shapeAndTypeBuilder_ == null) {
             shapeAndTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                 org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndType.Builder, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleShapeAndTypeOrBuilder>(
@@ -2160,8 +2159,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getShapeFieldBuilder();
-          getHandleDataFieldBuilder();
+          internalGetShapeFieldBuilder();
+          internalGetHandleDataFieldBuilder();
         }
       }
       @java.lang.Override
@@ -2273,14 +2272,14 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getShapeFieldBuilder().getBuilder(),
+                    internalGetShapeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
               } // case 10
               case 34: {
                 input.readMessage(
-                    getHandleDataFieldBuilder().getBuilder(),
+                    internalGetHandleDataFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -2393,7 +2392,7 @@ public Builder clearShape() {
       public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getShapeFieldBuilder().getBuilder();
+        return internalGetShapeFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TensorShapeProto shape = 1;
@@ -2411,7 +2410,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getShapeFieldBuilder() {
+          internalGetShapeFieldBuilder() {
         if (shapeBuilder_ == null) {
           shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -2514,7 +2513,7 @@ public Builder clearHandleData() {
       public org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleData.Builder getHandleDataBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getHandleDataFieldBuilder().getBuilder();
+        return internalGetHandleDataFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.core.CppShapeInferenceResult.HandleData handle_data = 4;
@@ -2532,7 +2531,7 @@ public org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.Handl
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleData, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleData.Builder, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleDataOrBuilder> 
-          getHandleDataFieldBuilder() {
+          internalGetHandleDataFieldBuilder() {
         if (handleDataBuilder_ == null) {
           handleDataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleData, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleData.Builder, org.tensorflow.proto.core.CppShapeInference.CppShapeInferenceResult.HandleDataOrBuilder>(
@@ -2645,8 +2644,8 @@ public static final class CppShapeInferenceInputsNeeded extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CppShapeInferenceInputsNeeded.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/core/platform/CorePlatformPayloads.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/core/platform/CorePlatformPayloads.java
index 9495889ac7d..3e4af931c34 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/core/platform/CorePlatformPayloads.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/core/platform/CorePlatformPayloads.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/core_platform_payloads.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.core.platform;
 
+@com.google.protobuf.Generated
 public final class CorePlatformPayloads {
   private CorePlatformPayloads() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CorePlatformPayloads.class.getName());
   }
@@ -58,8 +59,8 @@ public static final class ErrorSourceProto extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ErrorSourceProto.class.getName());
     }
@@ -136,8 +137,8 @@ public enum ErrorSource
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           ErrorSource.class.getName());
       }
@@ -241,7 +242,7 @@ public ErrorSource findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.core.platform.CorePlatformPayloads.ErrorSourceProto.getDescriptor().getEnumTypes().get(0);
       }
@@ -619,9 +620,7 @@ public org.tensorflow.proto.core.platform.CorePlatformPayloads.ErrorSourceProto.
        * @return This builder for chaining.
        */
       public Builder setErrorSource(org.tensorflow.proto.core.platform.CorePlatformPayloads.ErrorSourceProto.ErrorSource value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         errorSource_ = value.getNumber();
         onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DataService.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DataService.java
index 1896f0356f2..e77bab6d10d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DataService.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DataService.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/data_service.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.data;
 
+@com.google.protobuf.Generated
 public final class DataService {
   private DataService() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DataService.class.getName());
   }
@@ -70,8 +71,8 @@ public enum DeploymentMode
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DeploymentMode.class.getName());
     }
@@ -162,7 +163,7 @@ public DeploymentMode findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.data.DataService.getDescriptor().getEnumTypes().get(0);
     }
@@ -221,8 +222,8 @@ public static final class ProcessingModeDef extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ProcessingModeDef.class.getName());
     }
@@ -330,8 +331,8 @@ public enum ShardingPolicy
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           ShardingPolicy.class.getName());
       }
@@ -462,7 +463,7 @@ public ShardingPolicy findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.data.DataService.ProcessingModeDef.getDescriptor().getEnumTypes().get(0);
       }
@@ -838,9 +839,7 @@ public org.tensorflow.proto.data.DataService.ProcessingModeDef.ShardingPolicy ge
        * @return This builder for chaining.
        */
       public Builder setShardingPolicy(org.tensorflow.proto.data.DataService.ProcessingModeDef.ShardingPolicy value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         shardingPolicy_ = value.getNumber();
         onChanged();
@@ -971,8 +970,8 @@ public static final class DataServiceMetadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DataServiceMetadata.class.getName());
     }
@@ -1038,8 +1037,8 @@ public enum Compression
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           Compression.class.getName());
       }
@@ -1130,7 +1129,7 @@ public Compression findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.data.DataService.DataServiceMetadata.getDescriptor().getEnumTypes().get(0);
       }
@@ -1736,9 +1735,7 @@ public org.tensorflow.proto.data.DataService.DataServiceMetadata.Compression get
        * @return This builder for chaining.
        */
       public Builder setCompression(org.tensorflow.proto.data.DataService.DataServiceMetadata.Compression value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000002;
         compression_ = value.getNumber();
         onChanged();
@@ -1878,8 +1875,8 @@ public static final class CrossTrainerCacheOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CrossTrainerCacheOptions.class.getName());
     }
@@ -2392,8 +2389,8 @@ public static final class DataServiceConfig extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DataServiceConfig.class.getName());
     }
@@ -2767,9 +2764,7 @@ public org.tensorflow.proto.data.DataService.DeploymentMode getDeploymentMode()
        * @return This builder for chaining.
        */
       public Builder setDeploymentMode(org.tensorflow.proto.data.DataService.DeploymentMode value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         deploymentMode_ = value.getNumber();
         onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/Dataset.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/Dataset.java
index c381a210b70..cf9263ba4d4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/Dataset.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/Dataset.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/dataset.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.data;
 
+@com.google.protobuf.Generated
 public final class Dataset {
   private Dataset() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Dataset.class.getName());
   }
@@ -132,8 +133,8 @@ public static final class CompressedComponentMetadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CompressedComponentMetadata.class.getName());
     }
@@ -515,7 +516,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getTensorShapeFieldBuilder();
+          internalGetTensorShapeFieldBuilder();
         }
       }
       @java.lang.Override
@@ -641,7 +642,7 @@ public Builder mergeFrom(
               } // case 8
               case 18: {
                 input.readMessage(
-                    getTensorShapeFieldBuilder().getBuilder(),
+                    internalGetTensorShapeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -729,9 +730,7 @@ public org.tensorflow.proto.DataType getDtype() {
        * @return This builder for chaining.
        */
       public Builder setDtype(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         dtype_ = value.getNumber();
         onChanged();
@@ -871,7 +870,7 @@ public Builder clearTensorShape() {
       public org.tensorflow.proto.TensorShapeProto.Builder getTensorShapeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getTensorShapeFieldBuilder().getBuilder();
+        return internalGetTensorShapeFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -897,7 +896,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getTensorShapeOrBuilder()
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getTensorShapeFieldBuilder() {
+          internalGetTensorShapeFieldBuilder() {
         if (tensorShapeBuilder_ == null) {
           tensorShapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -1184,8 +1183,8 @@ public static final class CompressedElement extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CompressedElement.class.getName());
     }
@@ -1596,7 +1595,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(org.tensorflow.proto.data.Dataset.CompressedElement other) {
         if (other == org.tensorflow.proto.data.Dataset.CompressedElement.getDefaultInstance()) return this;
-        if (other.getData() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getData().isEmpty()) {
           setData(other.getData());
         }
         if (componentMetadataBuilder_ == null) {
@@ -1619,7 +1618,7 @@ public Builder mergeFrom(org.tensorflow.proto.data.Dataset.CompressedElement oth
               bitField0_ = (bitField0_ & ~0x00000002);
               componentMetadataBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getComponentMetadataFieldBuilder() : null;
+                   internalGetComponentMetadataFieldBuilder() : null;
             } else {
               componentMetadataBuilder_.addAllMessages(other.componentMetadata_);
             }
@@ -1970,7 +1969,7 @@ public Builder removeComponentMetadata(int index) {
        */
       public org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.Builder getComponentMetadataBuilder(
           int index) {
-        return getComponentMetadataFieldBuilder().getBuilder(index);
+        return internalGetComponentMetadataFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -2009,7 +2008,7 @@ public org.tensorflow.proto.data.Dataset.CompressedComponentMetadataOrBuilder ge
        * repeated .tensorflow.data.CompressedComponentMetadata component_metadata = 2;
        */
       public org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.Builder addComponentMetadataBuilder() {
-        return getComponentMetadataFieldBuilder().addBuilder(
+        return internalGetComponentMetadataFieldBuilder().addBuilder(
             org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.getDefaultInstance());
       }
       /**
@@ -2021,7 +2020,7 @@ public org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.Builder add
        */
       public org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.Builder addComponentMetadataBuilder(
           int index) {
-        return getComponentMetadataFieldBuilder().addBuilder(
+        return internalGetComponentMetadataFieldBuilder().addBuilder(
             index, org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.getDefaultInstance());
       }
       /**
@@ -2033,11 +2032,11 @@ public org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.Builder add
        */
       public java.util.List 
            getComponentMetadataBuilderList() {
-        return getComponentMetadataFieldBuilder().getBuilderList();
+        return internalGetComponentMetadataFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.data.Dataset.CompressedComponentMetadata, org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.Builder, org.tensorflow.proto.data.Dataset.CompressedComponentMetadataOrBuilder> 
-          getComponentMetadataFieldBuilder() {
+          internalGetComponentMetadataFieldBuilder() {
         if (componentMetadataBuilder_ == null) {
           componentMetadataBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.data.Dataset.CompressedComponentMetadata, org.tensorflow.proto.data.Dataset.CompressedComponentMetadata.Builder, org.tensorflow.proto.data.Dataset.CompressedComponentMetadataOrBuilder>(
@@ -2201,8 +2200,8 @@ public static final class UncompressedElement extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         UncompressedElement.class.getName());
     }
@@ -2552,7 +2551,7 @@ public Builder mergeFrom(org.tensorflow.proto.data.Dataset.UncompressedElement o
               bitField0_ = (bitField0_ & ~0x00000001);
               componentsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getComponentsFieldBuilder() : null;
+                   internalGetComponentsFieldBuilder() : null;
             } else {
               componentsBuilder_.addAllMessages(other.components_);
             }
@@ -2794,7 +2793,7 @@ public Builder removeComponents(int index) {
        */
       public org.tensorflow.proto.TensorProto.Builder getComponentsBuilder(
           int index) {
-        return getComponentsFieldBuilder().getBuilder(index);
+        return internalGetComponentsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.TensorProto components = 1;
@@ -2821,7 +2820,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getComponentsOrBuilder(
        * repeated .tensorflow.TensorProto components = 1;
        */
       public org.tensorflow.proto.TensorProto.Builder addComponentsBuilder() {
-        return getComponentsFieldBuilder().addBuilder(
+        return internalGetComponentsFieldBuilder().addBuilder(
             org.tensorflow.proto.TensorProto.getDefaultInstance());
       }
       /**
@@ -2829,7 +2828,7 @@ public org.tensorflow.proto.TensorProto.Builder addComponentsBuilder() {
        */
       public org.tensorflow.proto.TensorProto.Builder addComponentsBuilder(
           int index) {
-        return getComponentsFieldBuilder().addBuilder(
+        return internalGetComponentsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TensorProto.getDefaultInstance());
       }
       /**
@@ -2837,11 +2836,11 @@ public org.tensorflow.proto.TensorProto.Builder addComponentsBuilder(
        */
       public java.util.List 
            getComponentsBuilderList() {
-        return getComponentsFieldBuilder().getBuilderList();
+        return internalGetComponentsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-          getComponentsFieldBuilder() {
+          internalGetComponentsFieldBuilder() {
         if (componentsBuilder_ == null) {
           componentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DatasetMetadata.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DatasetMetadata.java
index 984536f55e7..763d82f05a5 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DatasetMetadata.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DatasetMetadata.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/dataset_metadata.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.data;
 
+@com.google.protobuf.Generated
 public final class DatasetMetadata {
   private DatasetMetadata() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DatasetMetadata.class.getName());
   }
@@ -63,8 +64,8 @@ public static final class Metadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Metadata.class.getName());
     }
@@ -400,7 +401,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(org.tensorflow.proto.data.DatasetMetadata.Metadata other) {
         if (other == org.tensorflow.proto.data.DatasetMetadata.Metadata.getDefaultInstance()) return this;
-        if (other.getName() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getName().isEmpty()) {
           setName(other.getName());
         }
         if (!other.getDataServiceAddress().isEmpty()) {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DatasetOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DatasetOptions.java
index da4fbd9787b..b1c18ef2cd4 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DatasetOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/DatasetOptions.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/dataset_options.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.data;
 
+@com.google.protobuf.Generated
 public final class DatasetOptions {
   private DatasetOptions() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DatasetOptions.class.getName());
   }
@@ -88,8 +89,8 @@ public enum AutoShardPolicy
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         AutoShardPolicy.class.getName());
     }
@@ -199,7 +200,7 @@ public AutoShardPolicy findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.data.DatasetOptions.getDescriptor().getEnumTypes().get(0);
     }
@@ -255,8 +256,8 @@ public enum ExternalStatePolicy
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ExternalStatePolicy.class.getName());
     }
@@ -329,7 +330,7 @@ public ExternalStatePolicy findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.data.DatasetOptions.getDescriptor().getEnumTypes().get(1);
     }
@@ -460,8 +461,8 @@ public static final class AutotuneOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         AutotuneOptions.class.getName());
     }
@@ -1671,9 +1672,7 @@ public org.tensorflow.proto.data.model.Model.AutotuneAlgorithm getAutotuneAlgori
        * @return This builder for chaining.
        */
       public Builder setAutotuneAlgorithm(org.tensorflow.proto.data.model.Model.AutotuneAlgorithm value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         optionalAutotuneAlgorithmCase_ = 4;
         optionalAutotuneAlgorithm_ = value.getNumber();
         onChanged();
@@ -1858,8 +1857,8 @@ public static final class CardinalityOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CardinalityOptions.class.getName());
     }
@@ -1921,8 +1920,8 @@ public enum ComputeLevel
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           ComputeLevel.class.getName());
       }
@@ -2008,7 +2007,7 @@ public ComputeLevel findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return org.tensorflow.proto.data.DatasetOptions.CardinalityOptions.getDescriptor().getEnumTypes().get(0);
       }
@@ -2384,9 +2383,7 @@ public org.tensorflow.proto.data.DatasetOptions.CardinalityOptions.ComputeLevel
        * @return This builder for chaining.
        */
       public Builder setComputeLevel(org.tensorflow.proto.data.DatasetOptions.CardinalityOptions.ComputeLevel value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         computeLevel_ = value.getNumber();
         onChanged();
@@ -2498,8 +2495,8 @@ public static final class DistributeOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DistributeOptions.class.getName());
     }
@@ -2996,9 +2993,7 @@ public org.tensorflow.proto.data.DatasetOptions.AutoShardPolicy getAutoShardPoli
        * @return This builder for chaining.
        */
       public Builder setAutoShardPolicy(org.tensorflow.proto.data.DatasetOptions.AutoShardPolicy value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         autoShardPolicy_ = value.getNumber();
         onChanged();
@@ -3284,8 +3279,8 @@ public static final class OptimizationOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         OptimizationOptions.class.getName());
     }
@@ -5627,8 +5622,8 @@ public static final class ServiceOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ServiceOptions.class.getName());
     }
@@ -6190,8 +6185,8 @@ public static final class ThreadingOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ThreadingOptions.class.getName());
     }
@@ -7156,8 +7151,8 @@ public static final class Options extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Options.class.getName());
     }
@@ -8272,11 +8267,11 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getAutotuneOptionsFieldBuilder();
-          getDistributeOptionsFieldBuilder();
-          getOptimizationOptionsFieldBuilder();
-          getServiceOptionsFieldBuilder();
-          getThreadingOptionsFieldBuilder();
+          internalGetAutotuneOptionsFieldBuilder();
+          internalGetDistributeOptionsFieldBuilder();
+          internalGetOptimizationOptionsFieldBuilder();
+          internalGetServiceOptionsFieldBuilder();
+          internalGetThreadingOptionsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -8535,14 +8530,14 @@ public Builder mergeFrom(
               } // case 8
               case 18: {
                 input.readMessage(
-                    getDistributeOptionsFieldBuilder().getBuilder(),
+                    internalGetDistributeOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000010;
                 break;
               } // case 18
               case 26: {
                 input.readMessage(
-                    getOptimizationOptionsFieldBuilder().getBuilder(),
+                    internalGetOptimizationOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000020;
                 break;
@@ -8554,7 +8549,7 @@ public Builder mergeFrom(
               } // case 32
               case 42: {
                 input.readMessage(
-                    getThreadingOptionsFieldBuilder().getBuilder(),
+                    internalGetThreadingOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000100;
                 break;
@@ -8567,7 +8562,7 @@ public Builder mergeFrom(
               } // case 48
               case 58: {
                 input.readMessage(
-                    getAutotuneOptionsFieldBuilder().getBuilder(),
+                    internalGetAutotuneOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000008;
                 break;
@@ -8596,7 +8591,7 @@ public Builder mergeFrom(
               } // case 90
               case 98: {
                 input.readMessage(
-                    getServiceOptionsFieldBuilder().getBuilder(),
+                    internalGetServiceOptionsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000040;
                 break;
@@ -9109,7 +9104,7 @@ public Builder clearAutotuneOptions() {
       public org.tensorflow.proto.data.DatasetOptions.AutotuneOptions.Builder getAutotuneOptionsBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
-        return getAutotuneOptionsFieldBuilder().getBuilder();
+        return internalGetAutotuneOptionsFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -9135,7 +9130,7 @@ public org.tensorflow.proto.data.DatasetOptions.AutotuneOptionsOrBuilder getAuto
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.data.DatasetOptions.AutotuneOptions, org.tensorflow.proto.data.DatasetOptions.AutotuneOptions.Builder, org.tensorflow.proto.data.DatasetOptions.AutotuneOptionsOrBuilder> 
-          getAutotuneOptionsFieldBuilder() {
+          internalGetAutotuneOptionsFieldBuilder() {
         if (autotuneOptionsBuilder_ == null) {
           autotuneOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.data.DatasetOptions.AutotuneOptions, org.tensorflow.proto.data.DatasetOptions.AutotuneOptions.Builder, org.tensorflow.proto.data.DatasetOptions.AutotuneOptionsOrBuilder>(
@@ -9266,7 +9261,7 @@ public Builder clearDistributeOptions() {
       public org.tensorflow.proto.data.DatasetOptions.DistributeOptions.Builder getDistributeOptionsBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
-        return getDistributeOptionsFieldBuilder().getBuilder();
+        return internalGetDistributeOptionsFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -9292,7 +9287,7 @@ public org.tensorflow.proto.data.DatasetOptions.DistributeOptionsOrBuilder getDi
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.data.DatasetOptions.DistributeOptions, org.tensorflow.proto.data.DatasetOptions.DistributeOptions.Builder, org.tensorflow.proto.data.DatasetOptions.DistributeOptionsOrBuilder> 
-          getDistributeOptionsFieldBuilder() {
+          internalGetDistributeOptionsFieldBuilder() {
         if (distributeOptionsBuilder_ == null) {
           distributeOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.data.DatasetOptions.DistributeOptions, org.tensorflow.proto.data.DatasetOptions.DistributeOptions.Builder, org.tensorflow.proto.data.DatasetOptions.DistributeOptionsOrBuilder>(
@@ -9423,7 +9418,7 @@ public Builder clearOptimizationOptions() {
       public org.tensorflow.proto.data.DatasetOptions.OptimizationOptions.Builder getOptimizationOptionsBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
-        return getOptimizationOptionsFieldBuilder().getBuilder();
+        return internalGetOptimizationOptionsFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -9449,7 +9444,7 @@ public org.tensorflow.proto.data.DatasetOptions.OptimizationOptionsOrBuilder get
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.data.DatasetOptions.OptimizationOptions, org.tensorflow.proto.data.DatasetOptions.OptimizationOptions.Builder, org.tensorflow.proto.data.DatasetOptions.OptimizationOptionsOrBuilder> 
-          getOptimizationOptionsFieldBuilder() {
+          internalGetOptimizationOptionsFieldBuilder() {
         if (optimizationOptionsBuilder_ == null) {
           optimizationOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.data.DatasetOptions.OptimizationOptions, org.tensorflow.proto.data.DatasetOptions.OptimizationOptions.Builder, org.tensorflow.proto.data.DatasetOptions.OptimizationOptionsOrBuilder>(
@@ -9580,7 +9575,7 @@ public Builder clearServiceOptions() {
       public org.tensorflow.proto.data.DatasetOptions.ServiceOptions.Builder getServiceOptionsBuilder() {
         bitField0_ |= 0x00000040;
         onChanged();
-        return getServiceOptionsFieldBuilder().getBuilder();
+        return internalGetServiceOptionsFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -9606,7 +9601,7 @@ public org.tensorflow.proto.data.DatasetOptions.ServiceOptionsOrBuilder getServi
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.data.DatasetOptions.ServiceOptions, org.tensorflow.proto.data.DatasetOptions.ServiceOptions.Builder, org.tensorflow.proto.data.DatasetOptions.ServiceOptionsOrBuilder> 
-          getServiceOptionsFieldBuilder() {
+          internalGetServiceOptionsFieldBuilder() {
         if (serviceOptionsBuilder_ == null) {
           serviceOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.data.DatasetOptions.ServiceOptions, org.tensorflow.proto.data.DatasetOptions.ServiceOptions.Builder, org.tensorflow.proto.data.DatasetOptions.ServiceOptionsOrBuilder>(
@@ -9779,7 +9774,7 @@ public Builder clearThreadingOptions() {
       public org.tensorflow.proto.data.DatasetOptions.ThreadingOptions.Builder getThreadingOptionsBuilder() {
         bitField0_ |= 0x00000100;
         onChanged();
-        return getThreadingOptionsFieldBuilder().getBuilder();
+        return internalGetThreadingOptionsFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -9805,7 +9800,7 @@ public org.tensorflow.proto.data.DatasetOptions.ThreadingOptionsOrBuilder getThr
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.data.DatasetOptions.ThreadingOptions, org.tensorflow.proto.data.DatasetOptions.ThreadingOptions.Builder, org.tensorflow.proto.data.DatasetOptions.ThreadingOptionsOrBuilder> 
-          getThreadingOptionsFieldBuilder() {
+          internalGetThreadingOptionsFieldBuilder() {
         if (threadingOptionsBuilder_ == null) {
           threadingOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.data.DatasetOptions.ThreadingOptions, org.tensorflow.proto.data.DatasetOptions.ThreadingOptions.Builder, org.tensorflow.proto.data.DatasetOptions.ThreadingOptionsOrBuilder>(
@@ -9866,9 +9861,7 @@ public org.tensorflow.proto.data.DatasetOptions.ExternalStatePolicy getExternalS
        * @return This builder for chaining.
        */
       public Builder setExternalStatePolicy(org.tensorflow.proto.data.DatasetOptions.ExternalStatePolicy value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         optionalExternalStatePolicyCase_ = 6;
         optionalExternalStatePolicy_ = value.getNumber();
         onChanged();
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/experimental/ServiceConfig.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/experimental/ServiceConfig.java
index 1da009dbcf5..b89b9ee12f9 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/experimental/ServiceConfig.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/experimental/ServiceConfig.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/service_config.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.data.experimental;
 
+@com.google.protobuf.Generated
 public final class ServiceConfig {
   private ServiceConfig() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ServiceConfig.class.getName());
   }
@@ -260,8 +261,8 @@ public static final class DispatcherConfig extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DispatcherConfig.class.getName());
     }
@@ -1704,9 +1705,7 @@ public org.tensorflow.proto.data.DataService.DeploymentMode getDeploymentMode()
        * @return This builder for chaining.
        */
       public Builder setDeploymentMode(org.tensorflow.proto.data.DataService.DeploymentMode value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000020;
         deploymentMode_ = value.getNumber();
         onChanged();
@@ -2362,8 +2361,8 @@ public static final class WorkerConfig extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         WorkerConfig.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/experimental/Snapshot.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/experimental/Snapshot.java
index f21a9672404..a4ce8b8b47f 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/experimental/Snapshot.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/experimental/Snapshot.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/snapshot.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.data.experimental;
 
+@com.google.protobuf.Generated
 public final class Snapshot {
   private Snapshot() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Snapshot.class.getName());
   }
@@ -71,8 +72,8 @@ public static final class SnapshotRecord extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SnapshotRecord.class.getName());
     }
@@ -424,7 +425,7 @@ public Builder mergeFrom(org.tensorflow.proto.data.experimental.Snapshot.Snapsho
               bitField0_ = (bitField0_ & ~0x00000001);
               tensorBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getTensorFieldBuilder() : null;
+                   internalGetTensorFieldBuilder() : null;
             } else {
               tensorBuilder_.addAllMessages(other.tensor_);
             }
@@ -666,7 +667,7 @@ public Builder removeTensor(int index) {
        */
       public org.tensorflow.proto.TensorProto.Builder getTensorBuilder(
           int index) {
-        return getTensorFieldBuilder().getBuilder(index);
+        return internalGetTensorFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.TensorProto tensor = 1;
@@ -693,7 +694,7 @@ public org.tensorflow.proto.TensorProtoOrBuilder getTensorOrBuilder(
        * repeated .tensorflow.TensorProto tensor = 1;
        */
       public org.tensorflow.proto.TensorProto.Builder addTensorBuilder() {
-        return getTensorFieldBuilder().addBuilder(
+        return internalGetTensorFieldBuilder().addBuilder(
             org.tensorflow.proto.TensorProto.getDefaultInstance());
       }
       /**
@@ -701,7 +702,7 @@ public org.tensorflow.proto.TensorProto.Builder addTensorBuilder() {
        */
       public org.tensorflow.proto.TensorProto.Builder addTensorBuilder(
           int index) {
-        return getTensorFieldBuilder().addBuilder(
+        return internalGetTensorFieldBuilder().addBuilder(
             index, org.tensorflow.proto.TensorProto.getDefaultInstance());
       }
       /**
@@ -709,11 +710,11 @@ public org.tensorflow.proto.TensorProto.Builder addTensorBuilder(
        */
       public java.util.List 
            getTensorBuilderList() {
-        return getTensorFieldBuilder().getBuilderList();
+        return internalGetTensorFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder> 
-          getTensorFieldBuilder() {
+          internalGetTensorFieldBuilder() {
         if (tensorBuilder_ == null) {
           tensorBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.TensorProto, org.tensorflow.proto.TensorProto.Builder, org.tensorflow.proto.TensorProtoOrBuilder>(
@@ -924,8 +925,8 @@ public static final class SnapshotMetadataRecord extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SnapshotMetadataRecord.class.getName());
     }
@@ -1080,8 +1081,9 @@ public long getVersion() {
 
     public static final int DTYPE_FIELD_NUMBER = 5;
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList dtype_;
-    private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
+    private com.google.protobuf.Internal.IntList dtype_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
         org.tensorflow.proto.DataType> dtype_converter_ =
             new com.google.protobuf.Internal.IntListAdapter.IntConverter<
                 org.tensorflow.proto.DataType>() {
@@ -1464,7 +1466,6 @@ public Builder clear() {
         creationTimestamp_ = 0L;
         version_ = 0L;
         dtype_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
         numElements_ = 0L;
         finalized_ = false;
         return this;
@@ -1493,20 +1494,11 @@ public org.tensorflow.proto.data.experimental.Snapshot.SnapshotMetadataRecord bu
       @java.lang.Override
       public org.tensorflow.proto.data.experimental.Snapshot.SnapshotMetadataRecord buildPartial() {
         org.tensorflow.proto.data.experimental.Snapshot.SnapshotMetadataRecord result = new org.tensorflow.proto.data.experimental.Snapshot.SnapshotMetadataRecord(this);
-        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(org.tensorflow.proto.data.experimental.Snapshot.SnapshotMetadataRecord result) {
-        if (((bitField0_ & 0x00000010) != 0)) {
-          dtype_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000010);
-        }
-        result.dtype_ = dtype_;
-      }
-
       private void buildPartial0(org.tensorflow.proto.data.experimental.Snapshot.SnapshotMetadataRecord result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1521,6 +1513,10 @@ private void buildPartial0(org.tensorflow.proto.data.experimental.Snapshot.Snaps
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.version_ = version_;
         }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          dtype_.makeImmutable();
+          result.dtype_ = dtype_;
+        }
         if (((from_bitField0_ & 0x00000020) != 0)) {
           result.numElements_ = numElements_;
         }
@@ -1560,7 +1556,8 @@ public Builder mergeFrom(org.tensorflow.proto.data.experimental.Snapshot.Snapsho
         if (!other.dtype_.isEmpty()) {
           if (dtype_.isEmpty()) {
             dtype_ = other.dtype_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            dtype_.makeImmutable();
+            bitField0_ |= 0x00000010;
           } else {
             ensureDtypeIsMutable();
             dtype_.addAll(other.dtype_);
@@ -1627,13 +1624,12 @@ public Builder mergeFrom(
               } // case 40
               case 42: {
                 int length = input.readRawVarint32();
-                int oldLimit = input.pushLimit(length);
-                while(input.getBytesUntilLimit() > 0) {
-                  int tmpRaw = input.readEnum();
-                  ensureDtypeIsMutable();
-                  dtype_.addInt(tmpRaw);
+                int limit = input.pushLimit(length);
+                ensureDtypeIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  dtype_.addInt(input.readEnum());
                 }
-                input.popLimit(oldLimit);
+                input.popLimit(limit);
                 break;
               } // case 42
               case 48: {
@@ -1940,13 +1936,12 @@ public Builder clearVersion() {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList dtype_ =
-        emptyIntList();
+      private com.google.protobuf.Internal.IntList dtype_ = emptyIntList();
       private void ensureDtypeIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
+        if (!dtype_.isModifiable()) {
           dtype_ = makeMutableCopy(dtype_);
-          bitField0_ |= 0x00000010;
         }
+        bitField0_ |= 0x00000010;
       }
       /**
        * 
@@ -1995,9 +1990,7 @@ public org.tensorflow.proto.DataType getDtype(int index) {
        */
       public Builder setDtype(
           int index, org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureDtypeIsMutable();
         dtype_.setInt(index, value.getNumber());
         onChanged();
@@ -2013,9 +2006,7 @@ public Builder setDtype(
        * @return This builder for chaining.
        */
       public Builder addDtype(org.tensorflow.proto.DataType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureDtypeIsMutable();
         dtype_.addInt(value.getNumber());
         onChanged();
@@ -2063,7 +2054,8 @@ public Builder clearDtype() {
        */
       public java.util.List
       getDtypeValueList() {
-        return java.util.Collections.unmodifiableList(dtype_);
+        dtype_.makeImmutable();
+        return dtype_;
       }
       /**
        * 
@@ -2300,8 +2292,8 @@ public static final class TensorMetadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TensorMetadata.class.getName());
     }
@@ -2578,7 +2570,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getTensorShapeFieldBuilder();
+          internalGetTensorShapeFieldBuilder();
         }
       }
       @java.lang.Override
@@ -2683,7 +2675,7 @@ public Builder mergeFrom(
                 break;
               case 18: {
                 input.readMessage(
-                    getTensorShapeFieldBuilder().getBuilder(),
+                    internalGetTensorShapeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -2801,7 +2793,7 @@ public Builder clearTensorShape() {
       public org.tensorflow.proto.TensorShapeProto.Builder getTensorShapeBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getTensorShapeFieldBuilder().getBuilder();
+        return internalGetTensorShapeFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.TensorShapeProto tensor_shape = 2;
@@ -2819,7 +2811,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getTensorShapeOrBuilder()
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-          getTensorShapeFieldBuilder() {
+          internalGetTensorShapeFieldBuilder() {
         if (tensorShapeBuilder_ == null) {
           tensorShapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
@@ -2970,8 +2962,8 @@ public static final class SnapshotTensorMetadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SnapshotTensorMetadata.class.getName());
     }
@@ -3321,7 +3313,7 @@ public Builder mergeFrom(org.tensorflow.proto.data.experimental.Snapshot.Snapsho
               bitField0_ = (bitField0_ & ~0x00000001);
               tensorMetadataBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getTensorMetadataFieldBuilder() : null;
+                   internalGetTensorMetadataFieldBuilder() : null;
             } else {
               tensorMetadataBuilder_.addAllMessages(other.tensorMetadata_);
             }
@@ -3563,7 +3555,7 @@ public Builder removeTensorMetadata(int index) {
        */
       public org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.Builder getTensorMetadataBuilder(
           int index) {
-        return getTensorMetadataFieldBuilder().getBuilder(index);
+        return internalGetTensorMetadataFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.data.experimental.TensorMetadata tensor_metadata = 1;
@@ -3590,7 +3582,7 @@ public org.tensorflow.proto.data.experimental.Snapshot.TensorMetadataOrBuilder g
        * repeated .tensorflow.data.experimental.TensorMetadata tensor_metadata = 1;
        */
       public org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.Builder addTensorMetadataBuilder() {
-        return getTensorMetadataFieldBuilder().addBuilder(
+        return internalGetTensorMetadataFieldBuilder().addBuilder(
             org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.getDefaultInstance());
       }
       /**
@@ -3598,7 +3590,7 @@ public org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.Builder ad
        */
       public org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.Builder addTensorMetadataBuilder(
           int index) {
-        return getTensorMetadataFieldBuilder().addBuilder(
+        return internalGetTensorMetadataFieldBuilder().addBuilder(
             index, org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.getDefaultInstance());
       }
       /**
@@ -3606,11 +3598,11 @@ public org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.Builder ad
        */
       public java.util.List 
            getTensorMetadataBuilderList() {
-        return getTensorMetadataFieldBuilder().getBuilderList();
+        return internalGetTensorMetadataFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata, org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.Builder, org.tensorflow.proto.data.experimental.Snapshot.TensorMetadataOrBuilder> 
-          getTensorMetadataFieldBuilder() {
+          internalGetTensorMetadataFieldBuilder() {
         if (tensorMetadataBuilder_ == null) {
           tensorMetadataBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata, org.tensorflow.proto.data.experimental.Snapshot.TensorMetadata.Builder, org.tensorflow.proto.data.experimental.Snapshot.TensorMetadataOrBuilder>(
@@ -3728,8 +3720,8 @@ public static final class DistributedSnapshotMetadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DistributedSnapshotMetadata.class.getName());
     }
@@ -4081,7 +4073,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(org.tensorflow.proto.data.experimental.Snapshot.DistributedSnapshotMetadata other) {
         if (other == org.tensorflow.proto.data.experimental.Snapshot.DistributedSnapshotMetadata.getDefaultInstance()) return this;
-        if (other.getElementSpec() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getElementSpec().isEmpty()) {
           setElementSpec(other.getElementSpec());
         }
         if (!other.getCompression().isEmpty()) {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/model/Model.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/model/Model.java
index 871c4585112..7c1e5fd447b 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/model/Model.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/data/model/Model.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/framework/model.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.data.model;
 
+@com.google.protobuf.Generated
 public final class Model {
   private Model() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Model.class.getName());
   }
@@ -69,8 +70,8 @@ public enum NodeClass
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NodeClass.class.getName());
     }
@@ -163,7 +164,7 @@ public NodeClass findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.data.model.Model.getDescriptor().getEnumTypes().get(0);
     }
@@ -227,8 +228,8 @@ public enum AutotuneAlgorithm
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         AutotuneAlgorithm.class.getName());
     }
@@ -311,7 +312,7 @@ public AutotuneAlgorithm findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return org.tensorflow.proto.data.model.Model.getDescriptor().getEnumTypes().get(1);
     }
@@ -486,8 +487,8 @@ public static final class ModelProto extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ModelProto.class.getName());
     }
@@ -786,8 +787,8 @@ public static final class Node extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           Node.class.getName());
       }
@@ -906,8 +907,8 @@ public static final class Parameter extends
           com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
             com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
             /* major= */ 4,
-            /* minor= */ 28,
-            /* patch= */ 3,
+            /* minor= */ 31,
+            /* patch= */ 1,
             /* suffix= */ "",
             Parameter.class.getName());
         }
@@ -1389,16 +1390,16 @@ public Builder mergeFrom(org.tensorflow.proto.data.model.Model.ModelProto.Node.P
               bitField0_ |= 0x00000001;
               onChanged();
             }
-            if (other.getValue() != 0D) {
+            if (java.lang.Double.doubleToRawLongBits(other.getValue()) != 0) {
               setValue(other.getValue());
             }
-            if (other.getStateValue() != 0D) {
+            if (java.lang.Double.doubleToRawLongBits(other.getStateValue()) != 0) {
               setStateValue(other.getStateValue());
             }
-            if (other.getMin() != 0D) {
+            if (java.lang.Double.doubleToRawLongBits(other.getMin()) != 0) {
               setMin(other.getMin());
             }
-            if (other.getMax() != 0D) {
+            if (java.lang.Double.doubleToRawLongBits(other.getMax()) != 0) {
               setMax(other.getMax());
             }
             if (other.getTunable() != false) {
@@ -2801,13 +2802,13 @@ public Builder mergeFrom(org.tensorflow.proto.data.model.Model.ModelProto.Node o
                 bitField0_ = (bitField0_ & ~0x00000400);
                 parametersBuilder_ = 
                   com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                     getParametersFieldBuilder() : null;
+                     internalGetParametersFieldBuilder() : null;
               } else {
                 parametersBuilder_.addAllMessages(other.parameters_);
               }
             }
           }
-          if (other.getInputProcessingTimeSum() != 0D) {
+          if (java.lang.Double.doubleToRawLongBits(other.getInputProcessingTimeSum()) != 0) {
             setInputProcessingTimeSum(other.getInputProcessingTimeSum());
           }
           if (other.getInputProcessingTimeCount() != 0L) {
@@ -2827,10 +2828,10 @@ public Builder mergeFrom(org.tensorflow.proto.data.model.Model.ModelProto.Node o
           if (other.nodeClass_ != 0) {
             setNodeClassValue(other.getNodeClassValue());
           }
-          if (other.getRatio() != 0D) {
+          if (java.lang.Double.doubleToRawLongBits(other.getRatio()) != 0) {
             setRatio(other.getRatio());
           }
-          if (other.getMemoryRatio() != 0D) {
+          if (java.lang.Double.doubleToRawLongBits(other.getMemoryRatio()) != 0) {
             setMemoryRatio(other.getMemoryRatio());
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -3703,7 +3704,7 @@ public Builder removeParameters(int index) {
          */
         public org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.Builder getParametersBuilder(
             int index) {
-          return getParametersFieldBuilder().getBuilder(index);
+          return internalGetParametersFieldBuilder().getBuilder(index);
         }
         /**
          * 
@@ -3742,7 +3743,7 @@ public org.tensorflow.proto.data.model.Model.ModelProto.Node.ParameterOrBuilder
          * repeated .tensorflow.data.model.ModelProto.Node.Parameter parameters = 11;
          */
         public org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.Builder addParametersBuilder() {
-          return getParametersFieldBuilder().addBuilder(
+          return internalGetParametersFieldBuilder().addBuilder(
               org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.getDefaultInstance());
         }
         /**
@@ -3754,7 +3755,7 @@ public org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.Builder a
          */
         public org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.Builder addParametersBuilder(
             int index) {
-          return getParametersFieldBuilder().addBuilder(
+          return internalGetParametersFieldBuilder().addBuilder(
               index, org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.getDefaultInstance());
         }
         /**
@@ -3766,11 +3767,11 @@ public org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.Builder a
          */
         public java.util.List 
              getParametersBuilderList() {
-          return getParametersFieldBuilder().getBuilderList();
+          return internalGetParametersFieldBuilder().getBuilderList();
         }
         private com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter, org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.Builder, org.tensorflow.proto.data.model.Model.ModelProto.Node.ParameterOrBuilder> 
-            getParametersFieldBuilder() {
+            internalGetParametersFieldBuilder() {
           if (parametersBuilder_ == null) {
             parametersBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                 org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter, org.tensorflow.proto.data.model.Model.ModelProto.Node.Parameter.Builder, org.tensorflow.proto.data.model.Model.ModelProto.Node.ParameterOrBuilder>(
@@ -4021,9 +4022,7 @@ public org.tensorflow.proto.data.model.Model.NodeClass getNodeClass() {
          * @return This builder for chaining.
          */
         public Builder setNodeClass(org.tensorflow.proto.data.model.Model.NodeClass value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00004000;
           nodeClass_ = value.getNumber();
           onChanged();
@@ -4259,8 +4258,8 @@ public static final class OptimizationParams extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 28,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           OptimizationParams.class.getName());
       }
@@ -4660,7 +4659,7 @@ public Builder mergeFrom(org.tensorflow.proto.data.model.Model.ModelProto.Optimi
           if (other.getRamBudget() != 0L) {
             setRamBudget(other.getRamBudget());
           }
-          if (other.getModelInputTime() != 0D) {
+          if (java.lang.Double.doubleToRawLongBits(other.getModelInputTime()) != 0) {
             setModelInputTime(other.getModelInputTime());
           }
           this.mergeUnknownFields(other.getUnknownFields());
@@ -4776,9 +4775,7 @@ public org.tensorflow.proto.data.model.Model.AutotuneAlgorithm getAlgorithm() {
          * @return This builder for chaining.
          */
         public Builder setAlgorithm(org.tensorflow.proto.data.model.Model.AutotuneAlgorithm value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00000001;
           algorithm_ = value.getNumber();
           onChanged();
@@ -5520,7 +5517,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getOptimizationParamsFieldBuilder();
+          internalGetOptimizationParamsFieldBuilder();
         }
       }
       @java.lang.Override
@@ -5683,7 +5680,7 @@ public Builder mergeFrom(
               } // case 24
               case 42: {
                 input.readMessage(
-                    getOptimizationParamsFieldBuilder().getBuilder(),
+                    internalGetOptimizationParamsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000010;
                 break;
@@ -6184,7 +6181,7 @@ public Builder clearOptimizationParams() {
       public org.tensorflow.proto.data.model.Model.ModelProto.OptimizationParams.Builder getOptimizationParamsBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
-        return getOptimizationParamsFieldBuilder().getBuilder();
+        return internalGetOptimizationParamsFieldBuilder().getBuilder();
       }
       /**
        * .tensorflow.data.model.ModelProto.OptimizationParams optimization_params = 5;
@@ -6202,7 +6199,7 @@ public org.tensorflow.proto.data.model.Model.ModelProto.OptimizationParamsOrBuil
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.tensorflow.proto.data.model.Model.ModelProto.OptimizationParams, org.tensorflow.proto.data.model.Model.ModelProto.OptimizationParams.Builder, org.tensorflow.proto.data.model.Model.ModelProto.OptimizationParamsOrBuilder> 
-          getOptimizationParamsFieldBuilder() {
+          internalGetOptimizationParamsFieldBuilder() {
         if (optimizationParamsBuilder_ == null) {
           optimizationParamsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.tensorflow.proto.data.model.Model.ModelProto.OptimizationParams, org.tensorflow.proto.data.model.Model.ModelProto.OptimizationParams.Builder, org.tensorflow.proto.data.model.Model.ModelProto.OptimizationParamsOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/distributed_runtime/DistributedRuntimePayloads.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/distributed_runtime/DistributedRuntimePayloads.java
index a7c20819032..9098121e915 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/distributed_runtime/DistributedRuntimePayloads.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/distributed_runtime/DistributedRuntimePayloads.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/distributed_runtime_payloads.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.distributed_runtime;
 
+@com.google.protobuf.Generated
 public final class DistributedRuntimePayloads {
   private DistributedRuntimePayloads() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DistributedRuntimePayloads.class.getName());
   }
@@ -81,8 +82,8 @@ public static final class GrpcPayloadContainer extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         GrpcPayloadContainer.class.getName());
     }
@@ -734,8 +735,8 @@ public static final class GrpcPayloadsLost extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         GrpcPayloadsLost.class.getName());
     }
@@ -1102,8 +1103,8 @@ public static final class WorkerPossiblyRestarted extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         WorkerPossiblyRestarted.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/BfcMemoryMap.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/BfcMemoryMap.java
index 4b3d1af6d6d..9500c2dbb6a 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/BfcMemoryMap.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/BfcMemoryMap.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/bfc_memory_map.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.dummy;
 
+@com.google.protobuf.Generated
 public final class BfcMemoryMap {
   private BfcMemoryMap() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       BfcMemoryMap.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/ProfilerOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/ProfilerOptions.java
index 518b9303262..24966977559 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/ProfilerOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/ProfilerOptions.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/profiler/profiler_options.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.dummy;
 
+@com.google.protobuf.Generated
 public final class ProfilerOptions {
   private ProfilerOptions() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ProfilerOptions.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/RpcOptions.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/RpcOptions.java
index 46945c26c20..debbb775f9c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/RpcOptions.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/RpcOptions.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/rpc_options.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.dummy;
 
+@com.google.protobuf.Generated
 public final class RpcOptions {
   private RpcOptions() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RpcOptions.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/Status.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/Status.java
index 1bc9df42c5f..a116f82b454 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/Status.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/Status.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/status.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.dummy;
 
+@com.google.protobuf.Generated
 public final class Status {
   private Status() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Status.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/TestLog.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/TestLog.java
index a0200811eab..93ce1b1479d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/TestLog.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/dummy/TestLog.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/util/test_log.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.dummy;
 
+@com.google.protobuf.Generated
 public final class TestLog {
   private TestLog() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TestLog.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandle.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandle.java
index 9fce46e568f..645818ef5c8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandle.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandle.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/remote_tensor_handle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.eager;
 
 /**
  * Protobuf type {@code tensorflow.eager.RemoteTensorHandle}
  */
+@com.google.protobuf.Generated
 public final class RemoteTensorHandle extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.eager.RemoteTensorHandle)
@@ -17,8 +18,8 @@ public final class RemoteTensorHandle extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RemoteTensorHandle.class.getName());
   }
@@ -633,7 +634,7 @@ public Builder mergeFrom(org.tensorflow.proto.eager.RemoteTensorHandle other) {
             bitField0_ = (bitField0_ & ~0x00000020);
             resourceDtypesAndShapesBuilder_ = 
               com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                 getResourceDtypesAndShapesFieldBuilder() : null;
+                 internalGetResourceDtypesAndShapesFieldBuilder() : null;
           } else {
             resourceDtypesAndShapesBuilder_.addAllMessages(other.resourceDtypesAndShapes_);
           }
@@ -1052,9 +1053,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000010;
       dtype_ = value.getNumber();
       onChanged();
@@ -1307,7 +1306,7 @@ public Builder removeResourceDtypesAndShapes(int index) {
      */
     public org.tensorflow.proto.eager.ResourceDtypeAndShape.Builder getResourceDtypesAndShapesBuilder(
         int index) {
-      return getResourceDtypesAndShapesFieldBuilder().getBuilder(index);
+      return internalGetResourceDtypesAndShapesFieldBuilder().getBuilder(index);
     }
     /**
      * 
@@ -1346,7 +1345,7 @@ public org.tensorflow.proto.eager.ResourceDtypeAndShapeOrBuilder getResourceDtyp
      * repeated .tensorflow.eager.ResourceDtypeAndShape resource_dtypes_and_shapes = 6;
      */
     public org.tensorflow.proto.eager.ResourceDtypeAndShape.Builder addResourceDtypesAndShapesBuilder() {
-      return getResourceDtypesAndShapesFieldBuilder().addBuilder(
+      return internalGetResourceDtypesAndShapesFieldBuilder().addBuilder(
           org.tensorflow.proto.eager.ResourceDtypeAndShape.getDefaultInstance());
     }
     /**
@@ -1358,7 +1357,7 @@ public org.tensorflow.proto.eager.ResourceDtypeAndShape.Builder addResourceDtype
      */
     public org.tensorflow.proto.eager.ResourceDtypeAndShape.Builder addResourceDtypesAndShapesBuilder(
         int index) {
-      return getResourceDtypesAndShapesFieldBuilder().addBuilder(
+      return internalGetResourceDtypesAndShapesFieldBuilder().addBuilder(
           index, org.tensorflow.proto.eager.ResourceDtypeAndShape.getDefaultInstance());
     }
     /**
@@ -1370,11 +1369,11 @@ public org.tensorflow.proto.eager.ResourceDtypeAndShape.Builder addResourceDtype
      */
     public java.util.List 
          getResourceDtypesAndShapesBuilderList() {
-      return getResourceDtypesAndShapesFieldBuilder().getBuilderList();
+      return internalGetResourceDtypesAndShapesFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilder<
         org.tensorflow.proto.eager.ResourceDtypeAndShape, org.tensorflow.proto.eager.ResourceDtypeAndShape.Builder, org.tensorflow.proto.eager.ResourceDtypeAndShapeOrBuilder> 
-        getResourceDtypesAndShapesFieldBuilder() {
+        internalGetResourceDtypesAndShapesFieldBuilder() {
       if (resourceDtypesAndShapesBuilder_ == null) {
         resourceDtypesAndShapesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
             org.tensorflow.proto.eager.ResourceDtypeAndShape, org.tensorflow.proto.eager.ResourceDtypeAndShape.Builder, org.tensorflow.proto.eager.ResourceDtypeAndShapeOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandleOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandleOrBuilder.java
index 9eb4ee66050..affa36e46b8 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandleOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandleOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/remote_tensor_handle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.eager;
 
+@com.google.protobuf.Generated
 public interface RemoteTensorHandleOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.eager.RemoteTensorHandle)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandleProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandleProtos.java
index 45419a5c2bc..e3d17367a28 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandleProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/RemoteTensorHandleProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/remote_tensor_handle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.eager;
 
+@com.google.protobuf.Generated
 public final class RemoteTensorHandleProtos {
   private RemoteTensorHandleProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       RemoteTensorHandleProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/ResourceDtypeAndShape.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/ResourceDtypeAndShape.java
index 5612cb28e21..4c3fe8f7d67 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/ResourceDtypeAndShape.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/ResourceDtypeAndShape.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/remote_tensor_handle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.eager;
 
 /**
  * Protobuf type {@code tensorflow.eager.ResourceDtypeAndShape}
  */
+@com.google.protobuf.Generated
 public final class ResourceDtypeAndShape extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:tensorflow.eager.ResourceDtypeAndShape)
@@ -17,8 +18,8 @@ public final class ResourceDtypeAndShape extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ResourceDtypeAndShape.class.getName());
   }
@@ -293,7 +294,7 @@ private Builder(
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
-        getShapeFieldBuilder();
+        internalGetShapeFieldBuilder();
       }
     }
     @java.lang.Override
@@ -403,7 +404,7 @@ public Builder mergeFrom(
             } // case 8
             case 18: {
               input.readMessage(
-                  getShapeFieldBuilder().getBuilder(),
+                  internalGetShapeFieldBuilder().getBuilder(),
                   extensionRegistry);
               bitField0_ |= 0x00000002;
               break;
@@ -459,9 +460,7 @@ public org.tensorflow.proto.DataType getDtype() {
      * @return This builder for chaining.
      */
     public Builder setDtype(org.tensorflow.proto.DataType value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
+      if (value == null) { throw new NullPointerException(); }
       bitField0_ |= 0x00000001;
       dtype_ = value.getNumber();
       onChanged();
@@ -569,7 +568,7 @@ public Builder clearShape() {
     public org.tensorflow.proto.TensorShapeProto.Builder getShapeBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
-      return getShapeFieldBuilder().getBuilder();
+      return internalGetShapeFieldBuilder().getBuilder();
     }
     /**
      * .tensorflow.TensorShapeProto shape = 2;
@@ -587,7 +586,7 @@ public org.tensorflow.proto.TensorShapeProtoOrBuilder getShapeOrBuilder() {
      */
     private com.google.protobuf.SingleFieldBuilder<
         org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder> 
-        getShapeFieldBuilder() {
+        internalGetShapeFieldBuilder() {
       if (shapeBuilder_ == null) {
         shapeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
             org.tensorflow.proto.TensorShapeProto, org.tensorflow.proto.TensorShapeProto.Builder, org.tensorflow.proto.TensorShapeProtoOrBuilder>(
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/ResourceDtypeAndShapeOrBuilder.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/ResourceDtypeAndShapeOrBuilder.java
index 62bf875b768..eedd96d6d9c 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/ResourceDtypeAndShapeOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/eager/ResourceDtypeAndShapeOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/remote_tensor_handle.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.eager;
 
+@com.google.protobuf.Generated
 public interface ResourceDtypeAndShapeOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tensorflow.eager.ResourceDtypeAndShape)
     com.google.protobuf.MessageOrBuilder {
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/Code.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/Code.java
index ccc93676255..a084605e64e 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/Code.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/Code.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/error_codes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.error;
 
@@ -26,6 +26,7 @@
  *
  * Protobuf enum {@code tensorflow.error.Code}
  */
+@com.google.protobuf.Generated
 public enum Code
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
@@ -251,8 +252,8 @@ public enum Code
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Code.class.getName());
   }
@@ -544,7 +545,7 @@ public Code findValueByNumber(int number) {
       getDescriptorForType() {
     return getDescriptor();
   }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
+  public static com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
     return org.tensorflow.proto.error.ErrorCodesProtos.getDescriptor().getEnumTypes().get(0);
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/ErrorCodesProtos.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/ErrorCodesProtos.java
index 929653c772d..8aea4b1b115 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/ErrorCodesProtos.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/ErrorCodesProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: xla/tsl/protobuf/error_codes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.error;
 
+@com.google.protobuf.Generated
 public final class ErrorCodesProtos {
   private ErrorCodesProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ErrorCodesProtos.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/dummy/ErrorCodes.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/dummy/ErrorCodes.java
index 508d4b92941..1e18a8ca40d 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/dummy/ErrorCodes.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/error/dummy/ErrorCodes.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tensorflow/core/protobuf/error_codes.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.error.dummy;
 
+@com.google.protobuf.Generated
 public final class ErrorCodes {
   private ErrorCodes() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ErrorCodes.class.getName());
   }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/profiler/Xplane.java b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/profiler/Xplane.java
index 957746c4e45..c6314ca0125 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/profiler/Xplane.java
+++ b/tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto/profiler/Xplane.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: tsl/profiler/protobuf/xplane.proto
-// Protobuf Java Version: 4.28.3
+// Protobuf Java Version: 4.31.1
 
 package org.tensorflow.proto.profiler;
 
+@com.google.protobuf.Generated
 public final class Xplane {
   private Xplane() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 28,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Xplane.class.getName());
   }
@@ -193,8 +194,8 @@ public static final class XSpace extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         XSpace.class.getName());
     }
@@ -779,7 +780,7 @@ public Builder mergeFrom(org.tensorflow.proto.profiler.Xplane.XSpace other) {
               bitField0_ = (bitField0_ & ~0x00000001);
               planesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getPlanesFieldBuilder() : null;
+                   internalGetPlanesFieldBuilder() : null;
             } else {
               planesBuilder_.addAllMessages(other.planes_);
             }
@@ -1069,7 +1070,7 @@ public Builder removePlanes(int index) {
        */
       public org.tensorflow.proto.profiler.Xplane.XPlane.Builder getPlanesBuilder(
           int index) {
-        return getPlanesFieldBuilder().getBuilder(index);
+        return internalGetPlanesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .tensorflow.profiler.XPlane planes = 1;
@@ -1096,7 +1097,7 @@ public org.tensorflow.proto.profiler.Xplane.XPlaneOrBuilder getPlanesOrBuilder(
        * repeated .tensorflow.profiler.XPlane planes = 1;
        */
       public org.tensorflow.proto.profiler.Xplane.XPlane.Builder addPlanesBuilder() {
-        return getPlanesFieldBuilder().addBuilder(
+        return internalGetPlanesFieldBuilder().addBuilder(
             org.tensorflow.proto.profiler.Xplane.XPlane.getDefaultInstance());
       }
       /**
@@ -1104,7 +1105,7 @@ public org.tensorflow.proto.profiler.Xplane.XPlane.Builder addPlanesBuilder() {
        */
       public org.tensorflow.proto.profiler.Xplane.XPlane.Builder addPlanesBuilder(
           int index) {
-        return getPlanesFieldBuilder().addBuilder(
+        return internalGetPlanesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.profiler.Xplane.XPlane.getDefaultInstance());
       }
       /**
@@ -1112,11 +1113,11 @@ public org.tensorflow.proto.profiler.Xplane.XPlane.Builder addPlanesBuilder(
        */
       public java.util.List 
            getPlanesBuilderList() {
-        return getPlanesFieldBuilder().getBuilderList();
+        return internalGetPlanesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.profiler.Xplane.XPlane, org.tensorflow.proto.profiler.Xplane.XPlane.Builder, org.tensorflow.proto.profiler.Xplane.XPlaneOrBuilder> 
-          getPlanesFieldBuilder() {
+          internalGetPlanesFieldBuilder() {
         if (planesBuilder_ == null) {
           planesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.profiler.Xplane.XPlane, org.tensorflow.proto.profiler.Xplane.XPlane.Builder, org.tensorflow.proto.profiler.Xplane.XPlaneOrBuilder>(
@@ -1885,8 +1886,8 @@ public static final class XPlane extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         XPlane.class.getName());
     }
@@ -2746,7 +2747,7 @@ public Builder mergeFrom(org.tensorflow.proto.profiler.Xplane.XPlane other) {
               bitField0_ = (bitField0_ & ~0x00000004);
               linesBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getLinesFieldBuilder() : null;
+                   internalGetLinesFieldBuilder() : null;
             } else {
               linesBuilder_.addAllMessages(other.lines_);
             }
@@ -2778,7 +2779,7 @@ public Builder mergeFrom(org.tensorflow.proto.profiler.Xplane.XPlane other) {
               bitField0_ = (bitField0_ & ~0x00000020);
               statsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getStatsFieldBuilder() : null;
+                   internalGetStatsFieldBuilder() : null;
             } else {
               statsBuilder_.addAllMessages(other.stats_);
             }
@@ -3250,7 +3251,7 @@ public Builder removeLines(int index) {
        */
       public org.tensorflow.proto.profiler.Xplane.XLine.Builder getLinesBuilder(
           int index) {
-        return getLinesFieldBuilder().getBuilder(index);
+        return internalGetLinesFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -3292,7 +3293,7 @@ public org.tensorflow.proto.profiler.Xplane.XLineOrBuilder getLinesOrBuilder(
        * repeated .tensorflow.profiler.XLine lines = 3;
        */
       public org.tensorflow.proto.profiler.Xplane.XLine.Builder addLinesBuilder() {
-        return getLinesFieldBuilder().addBuilder(
+        return internalGetLinesFieldBuilder().addBuilder(
             org.tensorflow.proto.profiler.Xplane.XLine.getDefaultInstance());
       }
       /**
@@ -3305,7 +3306,7 @@ public org.tensorflow.proto.profiler.Xplane.XLine.Builder addLinesBuilder() {
        */
       public org.tensorflow.proto.profiler.Xplane.XLine.Builder addLinesBuilder(
           int index) {
-        return getLinesFieldBuilder().addBuilder(
+        return internalGetLinesFieldBuilder().addBuilder(
             index, org.tensorflow.proto.profiler.Xplane.XLine.getDefaultInstance());
       }
       /**
@@ -3318,11 +3319,11 @@ public org.tensorflow.proto.profiler.Xplane.XLine.Builder addLinesBuilder(
        */
       public java.util.List 
            getLinesBuilderList() {
-        return getLinesFieldBuilder().getBuilderList();
+        return internalGetLinesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.profiler.Xplane.XLine, org.tensorflow.proto.profiler.Xplane.XLine.Builder, org.tensorflow.proto.profiler.Xplane.XLineOrBuilder> 
-          getLinesFieldBuilder() {
+          internalGetLinesFieldBuilder() {
         if (linesBuilder_ == null) {
           linesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.profiler.Xplane.XLine, org.tensorflow.proto.profiler.Xplane.XLine.Builder, org.tensorflow.proto.profiler.Xplane.XLineOrBuilder>(
@@ -3970,7 +3971,7 @@ public Builder removeStats(int index) {
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder getStatsBuilder(
           int index) {
-        return getStatsFieldBuilder().getBuilder(index);
+        return internalGetStatsFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -4012,7 +4013,7 @@ public org.tensorflow.proto.profiler.Xplane.XStatOrBuilder getStatsOrBuilder(
        * repeated .tensorflow.profiler.XStat stats = 6;
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder() {
-        return getStatsFieldBuilder().addBuilder(
+        return internalGetStatsFieldBuilder().addBuilder(
             org.tensorflow.proto.profiler.Xplane.XStat.getDefaultInstance());
       }
       /**
@@ -4025,7 +4026,7 @@ public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder() {
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder(
           int index) {
-        return getStatsFieldBuilder().addBuilder(
+        return internalGetStatsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.profiler.Xplane.XStat.getDefaultInstance());
       }
       /**
@@ -4038,11 +4039,11 @@ public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder(
        */
       public java.util.List 
            getStatsBuilderList() {
-        return getStatsFieldBuilder().getBuilderList();
+        return internalGetStatsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.profiler.Xplane.XStat, org.tensorflow.proto.profiler.Xplane.XStat.Builder, org.tensorflow.proto.profiler.Xplane.XStatOrBuilder> 
-          getStatsFieldBuilder() {
+          internalGetStatsFieldBuilder() {
         if (statsBuilder_ == null) {
           statsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.profiler.Xplane.XStat, org.tensorflow.proto.profiler.Xplane.XStat.Builder, org.tensorflow.proto.profiler.Xplane.XStatOrBuilder>(
@@ -4195,8 +4196,8 @@ public interface XLineOrBuilder extends
 
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4205,8 +4206,8 @@ public interface XLineOrBuilder extends
         getEventsList();
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4214,8 +4215,8 @@ public interface XLineOrBuilder extends
     org.tensorflow.proto.profiler.Xplane.XEvent getEvents(int index);
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4223,8 +4224,8 @@ public interface XLineOrBuilder extends
     int getEventsCount();
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4233,8 +4234,8 @@ public interface XLineOrBuilder extends
         getEventsOrBuilderList();
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4259,8 +4260,8 @@ public static final class XLine extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         XLine.class.getName());
     }
@@ -4449,8 +4450,8 @@ public long getDurationPs() {
     private java.util.List events_;
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4461,8 +4462,8 @@ public java.util.List getEventsList
     }
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4474,8 +4475,8 @@ public java.util.List getEventsList
     }
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4486,8 +4487,8 @@ public int getEventsCount() {
     }
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4498,8 +4499,8 @@ public org.tensorflow.proto.profiler.Xplane.XEvent getEvents(int index) {
     }
     /**
      * 
-     * XEvents within the same XLine should not overlap in time, but they can be
-     * nested.
+     * XEvents within the same XLine should not partially overlap in time,
+     * but they can be nested.
      * 

      *
      * repeated .tensorflow.profiler.XEvent events = 4;
@@ -4909,7 +4910,7 @@ public Builder mergeFrom(org.tensorflow.proto.profiler.Xplane.XLine other) {
               bitField0_ = (bitField0_ & ~0x00000040);
               eventsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getEventsFieldBuilder() : null;
+                   internalGetEventsFieldBuilder() : null;
             } else {
               eventsBuilder_.addAllMessages(other.events_);
             }
@@ -5384,8 +5385,8 @@ private void ensureEventsIsMutable() {
 
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5399,8 +5400,8 @@ public java.util.List getEventsList
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5414,8 +5415,8 @@ public int getEventsCount() {
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5429,8 +5430,8 @@ public org.tensorflow.proto.profiler.Xplane.XEvent getEvents(int index) {
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5451,8 +5452,8 @@ public Builder setEvents(
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5470,8 +5471,8 @@ public Builder setEvents(
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5491,8 +5492,8 @@ public Builder addEvents(org.tensorflow.proto.profiler.Xplane.XEvent value) {
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5513,8 +5514,8 @@ public Builder addEvents(
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5532,8 +5533,8 @@ public Builder addEvents(
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5551,8 +5552,8 @@ public Builder addEvents(
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5571,8 +5572,8 @@ public Builder addAllEvents(
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5589,8 +5590,8 @@ public Builder clearEvents() {
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5607,20 +5608,20 @@ public Builder removeEvents(int index) {
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
        */
       public org.tensorflow.proto.profiler.Xplane.XEvent.Builder getEventsBuilder(
           int index) {
-        return getEventsFieldBuilder().getBuilder(index);
+        return internalGetEventsFieldBuilder().getBuilder(index);
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5634,8 +5635,8 @@ public org.tensorflow.proto.profiler.Xplane.XEventOrBuilder getEventsOrBuilder(
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
@@ -5650,44 +5651,44 @@ public org.tensorflow.proto.profiler.Xplane.XEventOrBuilder getEventsOrBuilder(
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
        */
       public org.tensorflow.proto.profiler.Xplane.XEvent.Builder addEventsBuilder() {
-        return getEventsFieldBuilder().addBuilder(
+        return internalGetEventsFieldBuilder().addBuilder(
             org.tensorflow.proto.profiler.Xplane.XEvent.getDefaultInstance());
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
        */
       public org.tensorflow.proto.profiler.Xplane.XEvent.Builder addEventsBuilder(
           int index) {
-        return getEventsFieldBuilder().addBuilder(
+        return internalGetEventsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.profiler.Xplane.XEvent.getDefaultInstance());
       }
       /**
        * 
-       * XEvents within the same XLine should not overlap in time, but they can be
-       * nested.
+       * XEvents within the same XLine should not partially overlap in time,
+       * but they can be nested.
        * 

        *
        * repeated .tensorflow.profiler.XEvent events = 4;
        */
       public java.util.List 
            getEventsBuilderList() {
-        return getEventsFieldBuilder().getBuilderList();
+        return internalGetEventsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.profiler.Xplane.XEvent, org.tensorflow.proto.profiler.Xplane.XEvent.Builder, org.tensorflow.proto.profiler.Xplane.XEventOrBuilder> 
-          getEventsFieldBuilder() {
+          internalGetEventsFieldBuilder() {
         if (eventsBuilder_ == null) {
           eventsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.profiler.Xplane.XEvent, org.tensorflow.proto.profiler.Xplane.XEvent.Builder, org.tensorflow.proto.profiler.Xplane.XEventOrBuilder>(
@@ -5883,8 +5884,8 @@ public static final class XEvent extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         XEvent.class.getName());
     }
@@ -6483,7 +6484,7 @@ public Builder mergeFrom(org.tensorflow.proto.profiler.Xplane.XEvent other) {
               bitField0_ = (bitField0_ & ~0x00000010);
               statsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getStatsFieldBuilder() : null;
+                   internalGetStatsFieldBuilder() : null;
             } else {
               statsBuilder_.addAllMessages(other.stats_);
             }
@@ -7046,7 +7047,7 @@ public Builder removeStats(int index) {
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder getStatsBuilder(
           int index) {
-        return getStatsFieldBuilder().getBuilder(index);
+        return internalGetStatsFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -7088,7 +7089,7 @@ public org.tensorflow.proto.profiler.Xplane.XStatOrBuilder getStatsOrBuilder(
        * repeated .tensorflow.profiler.XStat stats = 4;
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder() {
-        return getStatsFieldBuilder().addBuilder(
+        return internalGetStatsFieldBuilder().addBuilder(
             org.tensorflow.proto.profiler.Xplane.XStat.getDefaultInstance());
       }
       /**
@@ -7101,7 +7102,7 @@ public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder() {
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder(
           int index) {
-        return getStatsFieldBuilder().addBuilder(
+        return internalGetStatsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.profiler.Xplane.XStat.getDefaultInstance());
       }
       /**
@@ -7114,11 +7115,11 @@ public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder(
        */
       public java.util.List 
            getStatsBuilderList() {
-        return getStatsFieldBuilder().getBuilderList();
+        return internalGetStatsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.profiler.Xplane.XStat, org.tensorflow.proto.profiler.Xplane.XStat.Builder, org.tensorflow.proto.profiler.Xplane.XStatOrBuilder> 
-          getStatsFieldBuilder() {
+          internalGetStatsFieldBuilder() {
         if (statsBuilder_ == null) {
           statsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.profiler.Xplane.XStat, org.tensorflow.proto.profiler.Xplane.XStat.Builder, org.tensorflow.proto.profiler.Xplane.XStatOrBuilder>(
@@ -7297,8 +7298,8 @@ public static final class XStat extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         XStat.class.getName());
     }
@@ -8625,8 +8626,8 @@ public static final class XEventMetadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         XEventMetadata.class.getName());
     }
@@ -9258,7 +9259,7 @@ public Builder mergeFrom(org.tensorflow.proto.profiler.Xplane.XEventMetadata oth
           bitField0_ |= 0x00000004;
           onChanged();
         }
-        if (other.getMetadata() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getMetadata().isEmpty()) {
           setMetadata(other.getMetadata());
         }
         if (statsBuilder_ == null) {
@@ -9281,7 +9282,7 @@ public Builder mergeFrom(org.tensorflow.proto.profiler.Xplane.XEventMetadata oth
               bitField0_ = (bitField0_ & ~0x00000010);
               statsBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getStatsFieldBuilder() : null;
+                   internalGetStatsFieldBuilder() : null;
             } else {
               statsBuilder_.addAllMessages(other.stats_);
             }
@@ -9907,7 +9908,7 @@ public Builder removeStats(int index) {
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder getStatsBuilder(
           int index) {
-        return getStatsFieldBuilder().getBuilder(index);
+        return internalGetStatsFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -9949,7 +9950,7 @@ public org.tensorflow.proto.profiler.Xplane.XStatOrBuilder getStatsOrBuilder(
        * repeated .tensorflow.profiler.XStat stats = 5;
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder() {
-        return getStatsFieldBuilder().addBuilder(
+        return internalGetStatsFieldBuilder().addBuilder(
             org.tensorflow.proto.profiler.Xplane.XStat.getDefaultInstance());
       }
       /**
@@ -9962,7 +9963,7 @@ public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder() {
        */
       public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder(
           int index) {
-        return getStatsFieldBuilder().addBuilder(
+        return internalGetStatsFieldBuilder().addBuilder(
             index, org.tensorflow.proto.profiler.Xplane.XStat.getDefaultInstance());
       }
       /**
@@ -9975,11 +9976,11 @@ public org.tensorflow.proto.profiler.Xplane.XStat.Builder addStatsBuilder(
        */
       public java.util.List 
            getStatsBuilderList() {
-        return getStatsFieldBuilder().getBuilderList();
+        return internalGetStatsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           org.tensorflow.proto.profiler.Xplane.XStat, org.tensorflow.proto.profiler.Xplane.XStat.Builder, org.tensorflow.proto.profiler.Xplane.XStatOrBuilder> 
-          getStatsFieldBuilder() {
+          internalGetStatsFieldBuilder() {
         if (statsBuilder_ == null) {
           statsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.tensorflow.proto.profiler.Xplane.XStat, org.tensorflow.proto.profiler.Xplane.XStat.Builder, org.tensorflow.proto.profiler.Xplane.XStatOrBuilder>(
@@ -10229,8 +10230,8 @@ public static final class XStatMetadata extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 28,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         XStatMetadata.class.getName());
     }
diff --git a/tensorflow-core/tensorflow-core-native/src/gen/resources/org/tensorflow/base_api/api_def_AsString.pbtxt b/tensorflow-core/tensorflow-core-native/src/gen/resources/org/tensorflow/base_api/api_def_AsString.pbtxt
index 5b066f8b132..78ed2b87c20 100644
--- a/tensorflow-core/tensorflow-core-native/src/gen/resources/org/tensorflow/base_api/api_def_AsString.pbtxt
+++ b/tensorflow-core/tensorflow-core-native/src/gen/resources/org/tensorflow/base_api/api_def_AsString.pbtxt
@@ -11,6 +11,7 @@ END
     name: "scientific"
     description: <