diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c17564be5df..ad189bb59ff 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ the `dev` profile in your Maven command to use those artifacts instead of buildi
 Modifying the native op generation code (not the annotation processor) or the JavaCPP configuration (not the abstract Pointers) will require a
 complete build could be required to reflect the changes, otherwise `-Pdev` should be fine.
 
-## JDK 16+
+### JDK 16+
 
 If you're using JDK 16+, you need to add some exports for the formatter plugin:
 
@@ -98,6 +98,63 @@ Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.22.0:tes
 This is because the native code crashed (i.e. because of a segfault), and it should have created a dump file somewhere in the project that you can use
 to tell what caused the issue.
 
+## Upgrading TensorFlow Version
+
+To upgrade the version of TensorFlow that is embedded within TensorFlow Java, please follow carefully these steps.
+
+### Upgrading TensorFlow Runtime Library
+
+You can upgrade the version of the TensorFlow library by updating the archive downloadeded in the Bazel
+[workspace](https://github.com/tensorflow/java/blob/master/tensorflow-core/tensorflow-core-api/WORKSPACE#L19) at build time. Make sure to
+update the `urls`, `sha256` and `strip_prefix` fields of the `org_tensorflow` archive rule to reflect the values for the new version.
+
+### Ops Classification
+
+After building with the version of TensorFlow, you might notice that a lot of new operations appeared in the `org.tensorflow.ops.core`
+package of the [generated sources](https://github.com/tensorflow/java/tree/master/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core) of
+the `tensorflow-core-api` module. Many of these ops must be reclassified manually after running this initial build.
+
+The actual classification process is a bit arbitrary and based on the good jugement of the developer. The reason is that most ops in Python
+are being wrapped by a higher-level API and therefore are left unclassified, while in Java they are exposed and can be used directly by
+the users.
+
+For classifying an op, a `api_def` proto must be added to the `tensorflow-core-api` [folder](https://github.com/tensorflow/java/tree/master/tensorflow-core/tensorflow-core-api/src/bazel/api_def)
+for this purpose, redefining optionally its endpoints or its visibility.
+
+Writing these protos and trying the guess the right location for each new operation can become a tedious job so an utility program called `java_api_import`
+has been created to help you with this task. This utility is available under the `bazel-bin` folder of `tensorflow-core-api` after the
+initial build. Here is how to invoke it:
+
+```
+cd tensorflow-core/tensorflow-core-api
+./bazel-bin/java_api_import \
+  --java_api_dir=src/bazel/api_def \
+  --tf_src_dir=bazel-tensorflow-core-api/external/org_tensorflow \
+  --tf_lib_path=bazel-bin/external/org_tensorflow/tensorflow/libtensorflow_cc.<version>.<ext>
+```
+
+For each new operation detected (i.e. any operation that does not have a valid `api_def` proto yet), the utility will suggest you some possible
+package names that can be a good match for its classification (unless a "perfect match" has been found in the Python code, in which case the utility
+will automatically classify the op). It is also possible to enter manually the name of the package to use, and the package can have multiple levels (e.g. `linalg.sparse`). The utility
+application will then take care to write the `api_def` proto for each operation classified.
+
+Make sure to erase completely the generated source folder of the `tensorflow-core-api` module before rerunning the build so you can see
+if your ops have been classified properly.
+
+#### Ops Kernel Upgrade
+
+Some operations might be just an upgrade of another existing operations. For instance, there are many version of the `BatchMatMul` kernel (V1, V2, V3...).
+When you see that a new op is just an upgrade from another other one, make sure that the latest version has a valid endpoint and that all other
+previous versions of this operation are marked as `VISIBILITY: SKIP`.
+
+### Java Protos Classification
+
+TensorFlow Java distributes a large number proto definitions found in the TensorFlow Runtime Library as Java classes. Again, new protos might not
+be classified properly since they may be lacking the `option java_*` statements at the beginning of their definition. If you notice in the
+[generated protos](https://github.com/tensorflow/java/tree/master/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto) of the `tensorflow-core-api`
+that some new proto classes seems to be in the wrong package, create a Bazel patch at this effect to add the missing options.
+See [existing patches](https://github.com/tensorflow/java/blob/master/tensorflow-core/tensorflow-core-api/external/tensorflow-proto.patch) for examples.
+
 ## Contributing
 
 ### Formatting
diff --git a/README.md b/README.md
index 39e75306b11..5c117740db8 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ This table shows the mapping between different version of TensorFlow for Java an
 | 0.3.1  | 2.4.1  |
 | 0.3.2  | 2.4.1  |
 | 0.3.3  | 2.4.1  |
-| 0.4.0-SNAPSHOT | 2.5.0
+| 0.4.0-SNAPSHOT | 2.6.0
 
 ## How to Contribute?
 
diff --git a/pom.xml b/pom.xml
index c76ba81cf3f..ed06b80c231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
   </modules>
 
   <properties>
-    <project.build.sourceEncoding>ASCII</project.build.sourceEncoding>
+    <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <junit.version>5.6.2</junit.version>
diff --git a/tensorflow-core/tensorflow-core-api/WORKSPACE b/tensorflow-core/tensorflow-core-api/WORKSPACE
index 8a6251a2a02..f6aa07115ed 100644
--- a/tensorflow-core/tensorflow-core-api/WORKSPACE
+++ b/tensorflow-core/tensorflow-core-api/WORKSPACE
@@ -9,7 +9,7 @@ http_archive(
     name = "org_tensorflow",
     patches = [
         ":tensorflow-visibility.patch",
-        ":tensorflow-macosx.patch",
+#        ":tensorflow-macosx.patch",
 #        ":tensorflow-windows.patch", # https://github.com/tensorflow/tensorflow/issues/25213
         ":tensorflow-proto.patch",
     ],
@@ -17,10 +17,10 @@ http_archive(
     patch_args = ["-p1"],
     patch_cmds = ["grep -rl 'java_package' tensorflow/core | xargs sed -i.bak 's/^\(.* java_package = \"org\.tensorflow\.\)\(.*\"\)/\\1proto.\\2'/"],
     urls = [
-       "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.5.0.tar.gz",
+       "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.6.0.tar.gz",
     ],
-    sha256 = "233875ea27fc357f6b714b2a0de5f6ff124b50c1ee9b3b41f9e726e9e677b86c",
-    strip_prefix = "tensorflow-2.5.0"
+    sha256 = "41b32eeaddcbc02b0583660bcf508469550e4cd0f86b22d2abe72dfebeacde0f",
+    strip_prefix = "tensorflow-2.6.0"
 )
 
 # START: Upstream TensorFlow dependencies
diff --git a/tensorflow-core/tensorflow-core-api/external/tensorflow-proto.patch b/tensorflow-core/tensorflow-core-api/external/tensorflow-proto.patch
index 3372dc23a83..7823514e4bc 100644
--- a/tensorflow-core/tensorflow-core-api/external/tensorflow-proto.patch
+++ b/tensorflow-core/tensorflow-core-api/external/tensorflow-proto.patch
@@ -1,6 +1,6 @@
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/bfc_memory_map.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/bfc_memory_map.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/protobuf/bfc_memory_map.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/bfc_memory_map.proto	2021-04-27 10:18:43.910313526 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/bfc_memory_map.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/bfc_memory_map.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/bfc_memory_map.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/bfc_memory_map.proto	2021-08-30 11:22:48.263351451 +0900
 @@ -3,6 +3,9 @@
  package tensorflow;
  
@@ -11,12 +11,12 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/bfc_memory_map.proto ten
  
  // Some of the data from AllocatorStats
  message MemAllocatorStats {
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/snapshot.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/snapshot.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/protobuf/snapshot.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/snapshot.proto	2021-04-27 10:19:52.002448627 +0900
-@@ -6,6 +6,10 @@
- import "tensorflow/core/framework/tensor_shape.proto";
- import "tensorflow/core/framework/types.proto";
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/snapshot.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/snapshot.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/snapshot.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/snapshot.proto	2021-08-30 11:22:48.264351453 +0900
+@@ -8,6 +8,10 @@
+ 
+ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
  
 +option java_outer_classname = "SnapshotProtos";
 +option java_multiple_files = true;
@@ -25,9 +25,9 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/snapshot.proto tensorflo
  // Each SnapshotRecord represents one batch of pre-processed input data. A batch
  // consists of a list of tensors that we encode as TensorProtos. This message
  // doesn't store the structure of the batch.
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/device_properties.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/device_properties.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/protobuf/device_properties.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/device_properties.proto	2021-04-27 10:19:52.002448627 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/device_properties.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/device_properties.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/device_properties.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/device_properties.proto	2021-08-30 11:22:48.264351453 +0900
 @@ -19,6 +19,8 @@
  
  option cc_enable_arenas = true;
@@ -37,9 +37,9 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/device_properties.proto
  option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
  
  message DeviceProperties {
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/saved_object_graph.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/saved_object_graph.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/protobuf/saved_object_graph.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/saved_object_graph.proto	2021-04-27 10:19:52.003448629 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/saved_object_graph.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/saved_object_graph.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/saved_object_graph.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/saved_object_graph.proto	2021-08-30 11:22:48.265351456 +0900
 @@ -11,6 +11,9 @@
  
  option cc_enable_arenas = true;
@@ -50,9 +50,9 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/saved_object_graph.proto
  
  // A SavedObjectGraph is part of object-based SavedModels in TF 2.0. It
  // describes the directed graph of Python objects (or equivalent in other
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/struct.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/struct.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/protobuf/struct.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/struct.proto	2021-04-27 10:19:52.003448629 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/struct.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/struct.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/struct.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/struct.proto	2021-08-30 11:22:48.265351456 +0900
 @@ -7,6 +7,9 @@
  import "tensorflow/core/framework/types.proto";
  
@@ -63,9 +63,9 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/struct.proto tensorflow-
  
  // `StructuredValue` represents a dynamically typed value representing various
  // data structures that are inspired by Python data structures typically used in
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/trackable_object_graph.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/trackable_object_graph.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/protobuf/trackable_object_graph.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/trackable_object_graph.proto	2021-04-27 10:19:52.003448629 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/trackable_object_graph.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/trackable_object_graph.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/trackable_object_graph.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/trackable_object_graph.proto	2021-08-30 11:22:48.266351458 +0900
 @@ -4,6 +4,9 @@
  
  option cc_enable_arenas = true;
@@ -76,29 +76,29 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/trackable_object_graph.p
  
  // A TensorBundle addition which saves extra information about the objects which
  // own variables, allowing for more robust checkpoint loading into modified
- diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/transport_options.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/transport_options.proto
- --- tensorflow-2.5.0-rc1/tensorflow/core/protobuf/transport_options.proto	2021-01-21 09:25:54.000000000 +0900
- +++ tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/transport_options.proto	2021-02-08 09:42:56.660650580 +0900
- @@ -3,6 +3,7 @@
-  package tensorflow;
-
-  option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
- +option java_package = "org.tensorflow.distruntime";
-
-  // Extra data needed on a non-RDMA RecvBufResponse.
-  message RecvBufRespExtra {
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/lib/core/error_codes.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/lib/core/error_codes.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/lib/core/error_codes.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/lib/core/error_codes.proto	2021-04-27 10:19:52.003448629 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/transport_options.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/transport_options.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/transport_options.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/transport_options.proto	2021-08-30 11:22:48.266351458 +0900
+@@ -3,6 +3,7 @@
+ package tensorflow;
+ 
+ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
++option java_package = "org.tensorflow.distruntime";
+ 
+ // Extra data needed on a non-RDMA RecvBufResponse.
+ message RecvBufRespExtra {
+diff -ruN tensorflow-2.6.0/tensorflow/core/lib/core/error_codes.proto tensorflow-2.6.0-proto/tensorflow/core/lib/core/error_codes.proto
+--- tensorflow-2.6.0/tensorflow/core/lib/core/error_codes.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/lib/core/error_codes.proto	2021-08-30 11:22:48.267351461 +0900
 @@ -1,3 +1,5 @@
  syntax = "proto3";
  
 +option java_package = "org.tensorflow.framework";
 +
  import public "tensorflow/core/protobuf/error_codes.proto";
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/profiler/protobuf/xplane.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/profiler/protobuf/xplane.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/profiler/protobuf/xplane.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/profiler/protobuf/xplane.proto	2021-04-27 10:19:52.004448631 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/profiler/protobuf/xplane.proto tensorflow-2.6.0-proto/tensorflow/core/profiler/protobuf/xplane.proto
+--- tensorflow-2.6.0/tensorflow/core/profiler/protobuf/xplane.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/profiler/protobuf/xplane.proto	2021-08-30 11:22:48.267351461 +0900
 @@ -3,6 +3,9 @@
  package tensorflow.profiler;
  
@@ -109,9 +109,9 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/profiler/protobuf/xplane.proto te
  
  // A container of parallel XPlanes, generated by one or more profiling sources.
  // Next ID: 5
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/util/memmapped_file_system.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/util/memmapped_file_system.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/util/memmapped_file_system.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/util/memmapped_file_system.proto	2021-04-27 10:19:52.004448631 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/util/memmapped_file_system.proto tensorflow-2.6.0-proto/tensorflow/core/util/memmapped_file_system.proto
+--- tensorflow-2.6.0/tensorflow/core/util/memmapped_file_system.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/util/memmapped_file_system.proto	2021-08-30 11:22:48.268351463 +0900
 @@ -17,6 +17,9 @@
  package tensorflow;
  
@@ -122,9 +122,9 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/util/memmapped_file_system.proto
  
  // A message that describes one region of memmapped file.
  message MemmappedFileSystemDirectoryElement {
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/profiler/profiler_options.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/profiler/profiler_options.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/profiler/profiler_options.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/profiler/profiler_options.proto	2021-04-27 10:19:52.004448631 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/profiler/profiler_options.proto tensorflow-2.6.0-proto/tensorflow/core/profiler/profiler_options.proto
+--- tensorflow-2.6.0/tensorflow/core/profiler/profiler_options.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/profiler/profiler_options.proto	2021-08-30 11:22:48.268351463 +0900
 @@ -1,6 +1,9 @@
  syntax = "proto3";
  
@@ -135,24 +135,23 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/profiler/profiler_options.proto t
  
  // Next ID: 11
  message ProfileOptions {
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/protobuf/service_config.proto tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/service_config.proto
---- tensorflow-2.5.0-rc1/tensorflow/core/protobuf/service_config.proto	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-proto/tensorflow/core/protobuf/service_config.proto	2021-04-27 10:20:13.501491398 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/service_config.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/service_config.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/service_config.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/service_config.proto	2021-08-30 11:22:48.269351466 +0900
 @@ -1,6 +1,7 @@
  syntax = "proto3";
  
  package tensorflow.data.experimental;
 +option java_package = "org.tensorflow.data.experimental";
  
- // Configuration for a tf.data service DispatchServer.
- message DispatcherConfig {
-diff --git a/tensorflow/core/framework/dataset_options.proto b/tensorflow/core/framework/dataset_options.proto
-index 3d71a560956..4c427640148 100644
---- a/tensorflow/core/framework/dataset_options.proto
-+++ b/tensorflow/core/framework/dataset_options.proto
-@@ -2,6 +2,10 @@ syntax = "proto3";
+ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
+ 
+diff -ruN tensorflow-2.6.0/tensorflow/core/framework/dataset_options.proto tensorflow-2.6.0-proto/tensorflow/core/framework/dataset_options.proto
+--- tensorflow-2.6.0/tensorflow/core/framework/dataset_options.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/framework/dataset_options.proto	2021-08-30 11:22:48.269351466 +0900
+@@ -4,6 +4,10 @@
  
- package tensorflow.data;
+ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/dataset_options_go_proto";
  
 +option java_outer_classname = "DatasetOptionsProtos";
 +option java_multiple_files = true;
@@ -161,25 +160,23 @@ index 3d71a560956..4c427640148 100644
  // Represents the type of auto-sharding we enable.
  enum AutoShardPolicy {
    // AUTO: Attempts FILE-based sharding, falling back to DATA-based sharding.
-diff --git a/tensorflow/core/framework/model.proto b/tensorflow/core/framework/model.proto
-index ba74d7a2b7e..721dee57867 100644
---- a/tensorflow/core/framework/model.proto
-+++ b/tensorflow/core/framework/model.proto
-@@ -3,6 +3,9 @@ syntax = "proto3";
+diff -ruN tensorflow-2.6.0/tensorflow/core/framework/model.proto tensorflow-2.6.0-proto/tensorflow/core/framework/model.proto
+--- tensorflow-2.6.0/tensorflow/core/framework/model.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/framework/model.proto	2021-08-30 11:23:28.579451037 +0900
+@@ -3,6 +3,9 @@
  package tensorflow.data.model;
  
  option cc_enable_arenas = true;
 +option java_outer_classname = "ModelProtos";
 +option java_multiple_files = true;
 +option java_package = "org.tensorflow.data.model";
+ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/model_go_proto";
  
  // Class of a node in the performance model.
- enum NodeClass {
-diff --git a/tensorflow/core/grappler/costs/op_performance_data.proto b/tensorflow/core/grappler/costs/op_performance_data.proto
-index 5ef5fd927b8..7c9a6ca2141 100644
---- a/tensorflow/core/grappler/costs/op_performance_data.proto
-+++ b/tensorflow/core/grappler/costs/op_performance_data.proto
-@@ -17,6 +17,9 @@ syntax = "proto3";
+diff -ruN tensorflow-2.6.0/tensorflow/core/grappler/costs/op_performance_data.proto tensorflow-2.6.0-proto/tensorflow/core/grappler/costs/op_performance_data.proto
+--- tensorflow-2.6.0/tensorflow/core/grappler/costs/op_performance_data.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/grappler/costs/op_performance_data.proto	2021-08-30 11:22:48.270351468 +0900
+@@ -17,6 +17,9 @@
  
  package tensorflow;
  option cc_enable_arenas = true;
@@ -189,15 +186,15 @@ index 5ef5fd927b8..7c9a6ca2141 100644
  
  import "tensorflow/core/framework/tensor.proto";
  import "tensorflow/core/framework/tensor_shape.proto";
-diff --git a/tensorflow/core/protobuf/extension_type_variant.proto b/tensorflow/core/protobuf/extension_type_variant.proto
-index 536db3b2435..88c4701b505 100644
---- a/tensorflow/core/protobuf/extension_type_variant.proto
-+++ b/tensorflow/core/protobuf/extension_type_variant.proto
-@@ -3,6 +3,7 @@ syntax = "proto3";
+diff -ruN tensorflow-2.6.0/tensorflow/core/protobuf/composite_tensor_variant.proto tensorflow-2.6.0-proto/tensorflow/core/protobuf/composite_tensor_variant.proto
+--- tensorflow-2.6.0/tensorflow/core/protobuf/composite_tensor_variant.proto	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-proto/tensorflow/core/protobuf/composite_tensor_variant.proto	2021-08-30 15:43:37.086090343 +0900
+@@ -3,7 +3,7 @@
  package tensorflow;
  
  import "tensorflow/core/protobuf/struct.proto";
+-
 +option java_package = "org.tensorflow.framework";
+ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
  
- // Metadata for ExtensionTypeVariant, used when serializing as Variant.
- //
+ // Metadata for CompositeTensorVariant, used when serializing as Variant.
diff --git a/tensorflow-core/tensorflow-core-api/external/tensorflow-visibility.patch b/tensorflow-core/tensorflow-core-api/external/tensorflow-visibility.patch
index acfab123fd5..f4394ad2f4c 100644
--- a/tensorflow-core/tensorflow-core-api/external/tensorflow-visibility.patch
+++ b/tensorflow-core/tensorflow-core-api/external/tensorflow-visibility.patch
@@ -1,18 +1,18 @@
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/BUILD tensorflow-2.5.0-rc1-visibility/tensorflow/BUILD
---- tensorflow-2.5.0-rc1/tensorflow/BUILD	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-visibility/tensorflow/BUILD	2021-04-27 10:26:14.196211286 +0900
-@@ -38,7 +38,7 @@
+diff -ruN tensorflow-2.6.0/tensorflow/BUILD tensorflow-2.6.0-visibility/tensorflow/BUILD
+--- tensorflow-2.6.0/tensorflow/BUILD	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-visibility/tensorflow/BUILD	2021-08-30 11:18:31.089781754 +0900
+@@ -37,7 +37,7 @@
+ )
  load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
  
- package(
--    default_visibility = [":internal"],
-+    default_visibility = ["//visibility:public"],
-     licenses = ["notice"],  # Apache 2.0
- )
+-package(default_visibility = [":internal"])
++package(default_visibility = ["//visibility:public"])
+ 
+ licenses(["notice"])
  
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/api_def/BUILD tensorflow-2.5.0-rc1-visibility/tensorflow/core/api_def/BUILD
---- tensorflow-2.5.0-rc1/tensorflow/core/api_def/BUILD	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-visibility/tensorflow/core/api_def/BUILD	2021-04-27 10:29:38.712785268 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/core/api_def/BUILD tensorflow-2.6.0-visibility/tensorflow/core/api_def/BUILD
+--- tensorflow-2.6.0/tensorflow/core/api_def/BUILD	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-visibility/tensorflow/core/api_def/BUILD	2021-08-30 11:17:56.392705484 +0900
 @@ -29,7 +29,7 @@
  alias(
      name = "base_api_def",
@@ -22,9 +22,9 @@ diff -ruN tensorflow-2.5.0-rc1/tensorflow/core/api_def/BUILD tensorflow-2.5.0-rc
  )
  
  alias(
-diff -ruN tensorflow-2.5.0-rc1/tensorflow/tools/api/lib/BUILD tensorflow-2.5.0-rc1-visibility/tensorflow/tools/api/lib/BUILD
---- tensorflow-2.5.0-rc1/tensorflow/tools/api/lib/BUILD	2021-04-13 01:43:40.000000000 +0900
-+++ tensorflow-2.5.0-rc1-visibility/tensorflow/tools/api/lib/BUILD	2021-04-27 10:26:14.196211286 +0900
+diff -ruN tensorflow-2.6.0/tensorflow/tools/api/lib/BUILD tensorflow-2.6.0-visibility/tensorflow/tools/api/lib/BUILD
+--- tensorflow-2.6.0/tensorflow/tools/api/lib/BUILD	2021-08-10 04:10:27.000000000 +0900
++++ tensorflow-2.6.0-visibility/tensorflow/tools/api/lib/BUILD	2021-08-30 11:17:56.392705484 +0900
 @@ -16,6 +16,7 @@
  tf_proto_library(
      name = "api_objects_proto",
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_BatchMatMulV2.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_BatchMatMulV2.pbtxt
index fbe2f20e78d..a3fd55b55f5 100644
--- a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_BatchMatMulV2.pbtxt
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_BatchMatMulV2.pbtxt
@@ -1,6 +1,4 @@
 op {
   graph_op_name: "BatchMatMulV2"
-  endpoint {
-    name: "train.BatchMatMul"
-  }
+  visibility: SKIP
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_BatchMatMulV3.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_BatchMatMulV3.pbtxt
new file mode 100644
index 00000000000..463513824d1
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_BatchMatMulV3.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "BatchMatMulV3"
+  endpoint {
+    name: "train.BatchMatMul"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_CompositeTensorVariantFromComponents.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_CompositeTensorVariantFromComponents.pbtxt
new file mode 100644
index 00000000000..2a115714525
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_CompositeTensorVariantFromComponents.pbtxt
@@ -0,0 +1,3 @@
+op {
+  graph_op_name: "CompositeTensorVariantFromComponents"
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_CompositeTensorVariantToComponents.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_CompositeTensorVariantToComponents.pbtxt
new file mode 100644
index 00000000000..49f121eef4a
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_CompositeTensorVariantToComponents.pbtxt
@@ -0,0 +1,3 @@
+op {
+  graph_op_name: "CompositeTensorVariantToComponents"
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SnapshotDatasetReader.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SnapshotDatasetReader.pbtxt
new file mode 100644
index 00000000000..36a1a08fee1
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SnapshotDatasetReader.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "SnapshotDatasetReader"
+  endpoint {
+    name: "data.SnapshotDatasetReader"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SnapshotNestedDatasetReader.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SnapshotNestedDatasetReader.pbtxt
new file mode 100644
index 00000000000..8cd7d40eb47
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SnapshotNestedDatasetReader.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "SnapshotNestedDatasetReader"
+  endpoint {
+    name: "data.SnapshotNestedDatasetReader"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SparseSegmentSumGrad.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SparseSegmentSumGrad.pbtxt
new file mode 100644
index 00000000000..176863dd98c
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_SparseSegmentSumGrad.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "SparseSegmentSumGrad"
+  endpoint {
+    name: "sparse.SparseSegmentSumGrad"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Window.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Window.pbtxt
new file mode 100644
index 00000000000..95a92a29def
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Window.pbtxt
@@ -0,0 +1,3 @@
+op {
+  graph_op_name: "Window"
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_XlaRemoveDynamicDimensionSize.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_XlaRemoveDynamicDimensionSize.pbtxt
new file mode 100644
index 00000000000..9681ddd0420
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_XlaRemoveDynamicDimensionSize.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "XlaRemoveDynamicDimensionSize"
+  endpoint {
+    name: "xla.RemoveDynamicDimensionSize"
+  }
+}
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 5f1765d1f59..685dda6e2ac 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
@@ -475,13 +475,15 @@ public DeserializeIterator deserializeIterator(Operand<? extends TType> resource
    *  the values of {@code selector_input_dataset}.
    * @param outputTypes the value of the outputTypes property
    * @param outputShapes the value of the outputShapes property
+   * @param options carries optional attribute values
    * @return a new instance of DirectedInterleaveDataset
    */
   public DirectedInterleaveDataset directedInterleaveDataset(
       Operand<? extends TType> selectorInputDataset,
       Iterable<Operand<? extends TType>> dataInputDatasets,
-      List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    return DirectedInterleaveDataset.create(scope, selectorInputDataset, dataInputDatasets, outputTypes, outputShapes);
+      List<Class<? extends TType>> outputTypes, List<Shape> outputShapes,
+      DirectedInterleaveDataset.Options... options) {
+    return DirectedInterleaveDataset.create(scope, selectorInputDataset, dataInputDatasets, outputTypes, outputShapes, options);
   }
 
   /**
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 9c796755cb4..5f76519403f 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
@@ -37,7 +37,6 @@
 import org.tensorflow.op.math.Betainc;
 import org.tensorflow.op.math.Bincount;
 import org.tensorflow.op.math.Ceil;
-import org.tensorflow.op.math.CompareAndBitpack;
 import org.tensorflow.op.math.ComplexAbs;
 import org.tensorflow.op.math.Conj;
 import org.tensorflow.op.math.Cos;
@@ -481,11 +480,22 @@ public <T extends TType> Atan<T> atan(Operand<T> x) {
 
   /**
    * Computes arctangent of {@code y/x} element-wise, respecting signs of the arguments.
-   *  This is the angle ( \theta \in [-\pi, \pi] ) such that
-   *  [ x = r \cos(\theta) ]
+   *  This is the angle \( \theta \in [-\pi, \pi] \) such that
+   *  \[ x = r \cos(\theta) \]
    *  and
-   *  [ y = r \sin(\theta) ]
-   *  where (r = \sqrt(x^2 + y^2) ).
+   *  \[ y = r \sin(\theta) \]
+   *  where \(r = \sqrt{x^2 + y^2} \).
+   *  <p>For example:
+   *  <blockquote>
+   *  <blockquote>
+   *  <blockquote>
+   *  <p>x = [1., 1.]
+   *  y = [1., -1.]
+   *  print((tf.math.atan2(y,x) * (180 / np.pi)).numpy())
+   *  [ 45. -45.]
+   *  </blockquote>
+   *  </blockquote>
+   *  </blockquote>
    *
    * @param <T> data type for {@code z} output
    * @param y the y value
@@ -573,44 +583,22 @@ public <T extends TNumber> Ceil<T> ceil(Operand<T> x) {
     return Ceil.create(scope, x);
   }
 
-  /**
-   * Compare values of {@code input} to {@code threshold} and pack resulting bits into a {@code uint8}.
-   *  Each comparison returns a boolean {@code true} (if {@code input_value > threshold})
-   *  or and {@code false} otherwise.
-   *  <p>This operation is useful for Locality-Sensitive-Hashing (LSH) and other
-   *  algorithms that use hashing approximations of cosine and {@code L2} distances;
-   *  codes can be generated from an input via:
-   *  <pre>
-   *  codebook_size = 50
-   *  codebook_bits = codebook_size * 32
-   *  codebook = tf.get_variable('codebook', [x.shape[-1].value, codebook_bits],
-   *                             dtype=x.dtype,
-   *                             initializer=tf.orthogonal_initializer())
-   *  codes = compare_and_threshold(tf.matmul(x, codebook), threshold=0.)
-   *  codes = tf.bitcast(codes, tf.int32)  # go from uint8 to int32
-   *  # now codes has shape x.shape[:-1] + [codebook_size]
-   *  </pre>
-   *  <p><strong>NOTE</strong>: Currently, the innermost dimension of the tensor must be divisible
-   *  by 8.
-   *  <p>Given an {@code input} shaped {@code [s0, s1, ..., s_n]}, the output is
-   *  a {@code uint8} tensor shaped {@code [s0, s1, ..., s_n / 8]}.
-   *
-   * @param input Values to compare against {@code threshold} and bitpack.
-   * @param threshold Threshold to compare against.
-   * @param <T> data type for {@code CompareAndBitpack} output and operands
-   * @return a new instance of CompareAndBitpack
-   */
-  public <T extends TType> CompareAndBitpack compareAndBitpack(Operand<T> input,
-      Operand<T> threshold) {
-    return CompareAndBitpack.create(scope, input, threshold);
-  }
-
   /**
    * Computes the complex absolute value of a tensor.
    *  Given a tensor {@code x} of complex numbers, this operation returns a tensor of type
    *  {@code float} or {@code double} that is the absolute value of each element in {@code x}. All
    *  elements in {@code x} must be complex numbers of the form \(a + bj\). The absolute
    *  value is computed as \( \sqrt{a^2 + b^2}\).
+   *  <p>For example:
+   *  <blockquote>
+   *  <blockquote>
+   *  <blockquote>
+   *  <p>x = tf.complex(3.0, 4.0)
+   *  print((tf.raw_ops.ComplexAbs(x=x, Tout=tf.dtypes.float32, name=None)).numpy())
+   *  5.0
+   *  </blockquote>
+   *  </blockquote>
+   *  </blockquote>
    *
    * @param <U> data type for {@code y} output
    * @param x the x value
@@ -626,6 +614,16 @@ public ComplexAbs<TFloat32> complexAbs(Operand<? extends TType> x) {
    *  {@code float} or {@code double} that is the absolute value of each element in {@code x}. All
    *  elements in {@code x} must be complex numbers of the form \(a + bj\). The absolute
    *  value is computed as \( \sqrt{a^2 + b^2}\).
+   *  <p>For example:
+   *  <blockquote>
+   *  <blockquote>
+   *  <blockquote>
+   *  <p>x = tf.complex(3.0, 4.0)
+   *  print((tf.raw_ops.ComplexAbs(x=x, Tout=tf.dtypes.float32, name=None)).numpy())
+   *  5.0
+   *  </blockquote>
+   *  </blockquote>
+   *  </blockquote>
    *
    * @param <U> data type for {@code y} output
    * @param x the x value
@@ -867,7 +865,7 @@ public <T extends TType> Equal equal(Operand<T> x, Operand<T> y, Equal.Options..
   }
 
   /**
-   * Computes the Gauss error function of {@code x} element-wise.
+   * Computes the  <a href="https://en.wikipedia.org/wiki/Error_function">Gauss error function</a>  of {@code x} element-wise. In statistics, for non-negative values of $x$, the error function has the following interpretation: for a random variable $Y$ that is normally distributed with mean 0 and variance $1/\sqrt{2}$, $erf(x)$ is the probability that $Y$ falls in the range $[−x, x]$.
    *
    * @param <T> data type for {@code y} output
    * @param x the x value
@@ -1085,8 +1083,8 @@ public <T extends TNumber> Igamma<T> igamma(Operand<T> a, Operand<T> x) {
    *  The upper regularized incomplete Gamma function is defined as:
    *  <p>\(Q(a, x) = Gamma(a, x) / Gamma(a) = 1 - P(a, x)\)
    *  <p>where
-   *  <p>\(Gamma(a, x) = int_{x}^{\infty} t^{a-1} exp(-t) dt\)
-   *  <p>is the upper incomplete Gama function.
+   *  <p>\(Gamma(a, x) = \int_{x}^{\infty} t^{a-1} exp(-t) dt\)
+   *  <p>is the upper incomplete Gamma function.
    *  <p>Note, above {@code P(a, x)} ({@code Igamma}) is the lower regularized complete
    *  Gamma function.
    *
@@ -2234,9 +2232,9 @@ public <T extends TType> UnsortedSegmentProd<T> unsortedSegmentProd(Operand<T> d
    *  </div>
    *  <pre>
    *  c = tf.constant([[1,2,3,4], [5,6,7,8], [4,3,2,1]])
-   *  tf.unsorted_segment_sum(c, tf.constant([0, 1, 0]), num_segments=2)
-   *  # ==&gt; [[ 5,  5, 5, 5],
-   *  #       [5,  6, 7, 8]]
+   *  tf.math.unsorted_segment_sum(c, tf.constant([0, 1, 0]), num_segments=2)
+   *  # ==&gt; [[ 5, 5, 5, 5],
+   *  #       [5, 6, 7, 8]]
    *  </pre>
    *
    * @param <T> data type for {@code output} output
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 cc4f53394d3..9ec8edfb8c1 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
@@ -1864,19 +1864,6 @@ public <T extends TNumber> Softsign<T> softsign(Operand<T> features) {
    *  the {@code height} and {@code width} dimensions are moved to the {@code batch} dimension. After
    *  the zero-padding, both {@code height} and {@code width} of the input must be divisible by the
    *  block size.
-   *
-   * @param <T> data type for {@code output} output
-   * @param input 4-D with shape {@code [batch, height, width, depth]}.
-   * @param paddings 2-D tensor of non-negative integers with shape {@code [2, 2]}. It specifies
-   *  the padding of the input with zeros across the spatial dimensions as follows:
-   *  <pre>
-   *    paddings = [[pad_top, pad_bottom], [pad_left, pad_right]]
-   *  </pre>
-   *  <p>The effective spatial dimensions of the zero-padded input tensor will be:
-   *  <pre>
-   *    height_pad = pad_top + height + pad_bottom
-   *    width_pad = pad_left + width + pad_right
-   *  </pre>
    *  <p>The attr {@code block_size} must be greater than one. It indicates the block size.
    *  <ul>
    *  <li>Non-overlapping blocks of size {@code block_size x block size} in the height and
@@ -1935,6 +1922,19 @@ public <T extends TNumber> Softsign<T> softsign(Operand<T> features) {
    *  </pre>
    *  <p>Among others, this operation is useful for reducing atrous convolution into
    *  regular convolution.
+   *
+   * @param <T> data type for {@code output} output
+   * @param input 4-D with shape {@code [batch, height, width, depth]}.
+   * @param paddings 2-D tensor of non-negative integers with shape {@code [2, 2]}. It specifies
+   *  the padding of the input with zeros across the spatial dimensions as follows:
+   *  <pre>
+   *    paddings = [[pad_top, pad_bottom], [pad_left, pad_right]]
+   *  </pre>
+   *  <p>The effective spatial dimensions of the zero-padded input tensor will be:
+   *  <pre>
+   *    height_pad = pad_top + height + pad_bottom
+   *    width_pad = pad_left + width + pad_right
+   *  </pre>
    * @param blockSize the value of the blockSize property
    * @param <T> data type for {@code SpaceToBatch} output and operands
    * @return a new instance of SpaceToBatch
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 51c6d642818..74f7efb4623 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
@@ -294,12 +294,6 @@
 import org.tensorflow.op.core.VariableShape;
 import org.tensorflow.op.core.Where;
 import org.tensorflow.op.core.While;
-import org.tensorflow.op.core.XlaConvV2;
-import org.tensorflow.op.core.XlaDotV2;
-import org.tensorflow.op.core.XlaSetDynamicDimensionSize;
-import org.tensorflow.op.core.XlaSpmdFullToShardShape;
-import org.tensorflow.op.core.XlaSpmdShardToFullShape;
-import org.tensorflow.op.core.XlaVariadicSort;
 import org.tensorflow.op.core.Zeros;
 import org.tensorflow.op.core.ZerosLike;
 import org.tensorflow.types.TBool;
@@ -371,10 +365,10 @@ public final class Ops {
 
   public final SparseOps sparse;
 
-  public final BitwiseOps bitwise;
-
   public final TpuOps tpu;
 
+  public final BitwiseOps bitwise;
+
   public final MathOps math;
 
   public final AudioOps audio;
@@ -402,8 +396,8 @@ private Ops(Scope scope) {
     random = new RandomOps(this);
     strings = new StringsOps(this);
     sparse = new SparseOps(this);
-    bitwise = new BitwiseOps(this);
     tpu = new TpuOps(this);
+    bitwise = new BitwiseOps(this);
     math = new MathOps(this);
     audio = new AudioOps(this);
     signal = new SignalOps(this);
@@ -5716,17 +5710,8 @@ public <T extends TType> Snapshot<T> snapshot(Operand<T> input) {
    *  {@code [1, ..., M]} correspond to the position within the grid, and the batch
    *  dimension combines both the position within a spatial block and the original
    *  batch position.  Prior to division into blocks, the spatial dimensions of the
-   *  input are optionally zero padded according to {@code paddings}.  See below for a
+   *  input are optionally zero padded according to {@code paddings}. See below for a
    *  precise description.
-   *
-   * @param <T> data type for {@code output} output
-   * @param input N-D with shape {@code input_shape = [batch] + spatial_shape + remaining_shape},
-   *  where spatial_shape has {@code M} dimensions.
-   * @param blockShape 1-D with shape {@code [M]}, all values must be &gt;= 1.
-   * @param paddings 2-D with shape {@code [M, 2]}, all values must be &gt;= 0.
-   *  {@code paddings[i] = [pad_start, pad_end]} specifies the padding for input dimension
-   *  {@code i + 1}, which corresponds to spatial dimension {@code i}.  It is required that
-   *  {@code block_shape[i]} divides {@code input_shape[i + 1] + pad_start + pad_end}.
    *  <p>This operation is equivalent to the following steps:
    *  <ol>
    *  <li>
@@ -5815,6 +5800,15 @@ public <T extends TType> Snapshot<T> snapshot(Operand<T> input) {
    *  </pre>
    *  <p>Among others, this operation is useful for reducing atrous convolution into
    *  regular convolution.
+   *
+   * @param <T> data type for {@code output} output
+   * @param input N-D with shape {@code input_shape = [batch] + spatial_shape + remaining_shape},
+   *  where spatial_shape has {@code M} dimensions.
+   * @param blockShape 1-D with shape {@code [M]}, all values must be &gt;= 1.
+   * @param paddings 2-D with shape {@code [M, 2]}, all values must be &gt;= 0.
+   *  {@code paddings[i] = [pad_start, pad_end]} specifies the padding for input dimension
+   *  {@code i + 1}, which corresponds to spatial dimension {@code i}.  It is required that
+   *  {@code block_shape[i]} divides {@code input_shape[i + 1] + pad_start + pad_end}.
    * @param <T> data type for {@code SpaceToBatchND} output and operands
    * @return a new instance of SpaceToBatchNd
    */
@@ -6112,6 +6106,9 @@ public StatelessIf statelessIf(Operand<? extends TType> cond, Iterable<Operand<?
 
   /**
    * returns {@code f(inputs)}, where {@code f}'s body is placed and partitioned.
+   *  Asynchronously executes a function, potentially across multiple devices but
+   *  within a single process. The kernel places and partitions a given function's
+   *  underlying graph, and executes each of the partitioned subgraphs as a function.
    *
    * @param args A list of input tensors.
    * @param Tout A list of output types.
@@ -7170,7 +7167,7 @@ public <T extends TType> TensorMapStackKeys<T> tensorMapStackKeys(
    * Adds sparse {@code updates} to an existing tensor according to {@code indices}.
    *  This operation creates a new tensor by adding sparse {@code updates} to the passed
    *  in {@code tensor}.
-   *  This operation is very similar to {@code tf.scatter_nd_add}, except that the updates
+   *  This operation is very similar to {@code tf.compat.v1.scatter_nd_add}, except that the updates
    *  are added onto an existing tensor (as opposed to a variable). If the memory
    *  for the existing tensor cannot be re-used, a copy is made and updated.
    *  <p>{@code indices} is an integer tensor containing indices into a new tensor of shape
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 ca03d8b6a06..fee68e6042d 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
@@ -488,14 +488,18 @@ public <T extends TNumber> QuantizeAndDequantizeV3<T> quantizeAndDequantizeV3(Op
   }
 
   /**
-   * Returns the gradient of {@code quantization.QuantizeAndDequantizeV4}.
+   * Quantizes then dequantizes a tensor.
    *  This is almost identical to QuantizeAndDequantizeV2, except that it returns a
    *  gradient of 1 for inputs that are within the quantization range, or 0 otherwise.
    *
    * @param <T> data type for {@code output} output
-   * @param input the input value
-   * @param inputMin the inputMin value
-   * @param inputMax the inputMax value
+   * @param input Tensor to quantize and then dequantize.
+   * @param inputMin If {@code range_given == True}, this specifies the minimum input value that needs to
+   *  be represented, otherwise it is determined from the min value of the {@code input}
+   *  tensor.
+   * @param inputMax If {@code range_given == True}, this specifies the maximum input value that needs to
+   *  be represented, otherwise it is determined from the max value of the {@code input}
+   *  tensor.
    * @param options carries optional attribute values
    * @param <T> data type for {@code QuantizeAndDequantizeV4} output and operands
    * @return a new instance of QuantizeAndDequantizeV4
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SparseOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SparseOps.java
index a0ac9fcdf82..074cb7119d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SparseOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/SparseOps.java
@@ -52,6 +52,7 @@
 import org.tensorflow.op.sparse.SparseSegmentSqrtNGrad;
 import org.tensorflow.op.sparse.SparseSegmentSqrtNWithNumSegments;
 import org.tensorflow.op.sparse.SparseSegmentSum;
+import org.tensorflow.op.sparse.SparseSegmentSumGrad;
 import org.tensorflow.op.sparse.SparseSegmentSumWithNumSegments;
 import org.tensorflow.op.sparse.SparseSlice;
 import org.tensorflow.op.sparse.SparseSliceGrad;
@@ -1053,6 +1054,25 @@ public <T extends TNumber> SparseSegmentSum<T> sparseSegmentSum(Operand<T> data,
     return SparseSegmentSum.create(scope, data, indices, segmentIds);
   }
 
+  /**
+   * Computes gradients for SparseSegmentSum.
+   *  Returns tensor &quot;output&quot; with same shape as grad, except for dimension 0 whose
+   *  value is output_dim0.
+   *
+   * @param <T> data type for {@code output} output
+   * @param grad gradient propagated to the SparseSegmentSum op.
+   * @param indices indices passed to the corresponding SparseSegmentSum op.
+   * @param segmentIds segment_ids passed to the corresponding SparseSegmentSum op.
+   * @param outputDim0 dimension 0 of &quot;data&quot; passed to SparseSegmentSum op.
+   * @param <T> data type for {@code SparseSegmentSumGrad} output and operands
+   * @return a new instance of SparseSegmentSumGrad
+   */
+  public <T extends TNumber> SparseSegmentSumGrad<T> sparseSegmentSumGrad(Operand<T> grad,
+      Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
+      Operand<TInt32> outputDim0) {
+    return SparseSegmentSumGrad.create(scope, grad, indices, segmentIds, outputDim0);
+  }
+
   /**
    * Computes the sum along sparse segments of a tensor.
    *  Like {@code SparseSegmentSum}, but allows missing ids in {@code segment_ids}. If an id is
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/StringsOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/StringsOps.java
index 42c71804c10..77caa699358 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/StringsOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/StringsOps.java
@@ -94,7 +94,7 @@ public Join join(Iterable<Operand<TString>> inputs, Join.Options... options) {
    *  </blockquote>
    *  </blockquote>
    *
-   * @param input the input value
+   * @param input The input to be lower-cased.
    * @param options carries optional attribute values
    * @return a new instance of Lower
    */
@@ -283,6 +283,15 @@ public StringSplit stringSplit(Operand<TString> input, Operand<TString> sep,
 
   /**
    * Strip leading and trailing whitespaces from the Tensor.
+   *  Examples:
+   *  <blockquote>
+   *  <blockquote>
+   *  <blockquote>
+   *  <p>tf.strings.strip([&quot;\nTensorFlow&quot;, &quot;     The python library    &quot;]).numpy()
+   *  array([b'TensorFlow', b'The python library'], dtype=object)
+   *  </blockquote>
+   *  </blockquote>
+   *  </blockquote>
    *
    * @param input A string {@code Tensor} of any shape.
    * @return a new instance of Strip
@@ -629,7 +638,7 @@ public UnsortedSegmentJoin unsortedSegmentJoin(Operand<TString> inputs,
    *  </blockquote>
    *  </blockquote>
    *
-   * @param input the input value
+   * @param input The input to be upper-cased.
    * @param options carries optional attribute values
    * @return a new instance of Upper
    */
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TpuOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TpuOps.java
index 6cd4a872851..2bfd21c438e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TpuOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TpuOps.java
@@ -76,8 +76,9 @@ public Compile compile(Iterable<Operand<TInt64>> dynamicShapes,
   }
 
   /**
-   * Asserts that compilation succeeded. This op produces no output and closes the
-   *  device during failure to ensure all pending device interactions fail.
+   * Asserts that compilation succeeded.
+   *  This op produces no output and closes the device during failure to ensure all
+   *  pending device interactions fail.
    *  <p>'compilation_status' is a serialized CompilationResultProto.
    *
    * @param compilationStatus the compilationStatus value
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TrainOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TrainOps.java
index 2661165e101..d12c25a5ac8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TrainOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/TrainOps.java
@@ -510,16 +510,17 @@ public <T extends TType> ApplyRmsProp<T> applyRmsProp(Operand<T> var, Operand<T>
    *  about broadcasting
    *   <a href="http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html">here</a> .
    *
-   * @param <T> data type for {@code output} output
+   * @param <V> data type for {@code output} output
    * @param x 2-D or higher with shape {@code [..., r_x, c_x]}.
    * @param y 2-D or higher with shape {@code [..., r_y, c_y]}.
+   * @param Tout If not spcified, Tout is the same type to input type.
    * @param options carries optional attribute values
-   * @param <T> data type for {@code BatchMatMulV2} output and operands
+   * @param <V> data type for {@code BatchMatMulV3} output and operands
    * @return a new instance of BatchMatMul
    */
-  public <T extends TType> BatchMatMul<T> batchMatMul(Operand<T> x, Operand<T> y,
-      BatchMatMul.Options... options) {
-    return BatchMatMul.create(scope, x, y, options);
+  public <V extends TType> BatchMatMul<V> batchMatMul(Operand<? extends TType> x,
+      Operand<? extends TType> y, Class<V> Tout, BatchMatMul.Options... options) {
+    return BatchMatMul.create(scope, x, y, Tout, options);
   }
 
   /**
@@ -809,8 +810,8 @@ public <T extends TType> ResourceApplyCenteredRmsProp resourceApplyCenteredRmsPr
 
   /**
    * Update '*var' according to the Ftrl-proximal scheme.
+   *  accum_new = accum + grad * grad
    *  grad_with_shrinkage = grad + 2 * l2_shrinkage * var
-   *  accum_new = accum + grad_with_shrinkage * grad_with_shrinkage
    *  linear += grad_with_shrinkage +
    *  (accum_new^(-lr_power) - accum^(-lr_power)) / lr * var
    *  quadratic = 1.0 / (accum_new^(lr_power) * lr) + 2 * l2
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/XlaOps.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/XlaOps.java
index 07dd99967d1..9318cd63614 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/XlaOps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/XlaOps.java
@@ -36,6 +36,7 @@
 import org.tensorflow.op.xla.Recv;
 import org.tensorflow.op.xla.Reduce;
 import org.tensorflow.op.xla.ReduceWindow;
+import org.tensorflow.op.xla.RemoveDynamicDimensionSize;
 import org.tensorflow.op.xla.ReplicaId;
 import org.tensorflow.op.xla.Scatter;
 import org.tensorflow.op.xla.SelectAndScatter;
@@ -369,6 +370,24 @@ public <T extends TType, U extends TNumber> ReduceWindow<T> reduceWindow(Operand
     return ReduceWindow.create(scope, input, initValue, windowDimensions, windowStrides, baseDilations, windowDilations, padding, computation);
   }
 
+  /**
+   * Inverse of XlaSetDynamicDimensionSize. Make an xla bounded
+   *  <pre>
+   *      dynamic dimension into a static dimension. The bound of the size of
+   *      dimension `dim_index` becomes the static dimension size.
+   *  </pre>
+   *
+   * @param <T> data type for {@code output} output
+   * @param input the input value
+   * @param dimIndex the dimIndex value
+   * @param <T> data type for {@code XlaRemoveDynamicDimensionSize} output and operands
+   * @return a new instance of RemoveDynamicDimensionSize
+   */
+  public <T extends TType> RemoveDynamicDimensionSize<T> removeDynamicDimensionSize(
+      Operand<T> input, Operand<TInt32> dimIndex) {
+    return RemoveDynamicDimensionSize.create(scope, input, dimIndex);
+  }
+
   /**
    * Replica ID.
    *
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java
index ef9f8c7ebc7..d40163dc22d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java
@@ -135,6 +135,9 @@ public class tensorflow extends org.tensorflow.internal.c_api.presets.tensorflow
 
 public static native void TF_TString_Reserve(TF_TString str, @Cast("size_t") long new_cap);
 
+public static native void TF_TString_ReserveAmortized(TF_TString str,
+                                               @Cast("size_t") long new_cap);
+
 public static native @Cast("char*") BytePointer TF_TString_Resize(TF_TString str, @Cast("size_t") long new_size,
                                       @Cast("char") byte c);
 
@@ -199,11 +202,13 @@ public static native void TF_TString_Copy(TF_TString dst, String src,
 // regions immediately after allocation; doing so will elide a superfluous
 // initialization of the new buffer.
 // Reserves a string buffer with a capacity of at least `new_cap'.
-// ResizeUninitialized will not change the size, or the contents of the existing
+// Reserve will not change the size, or the contents of the existing
 // string.  This is useful if you have a rough idea of `str's upperbound in
 // size, and want to avoid allocations as you append to `str'. It should not be
 // considered safe to write in the region between size and capacity; explicitly
 // resize before doing so.
+// Similar to TF_TString_Reserve, except that we ensure amortized growth, i.e.
+// that we grow the capacity by at least a constant factor >1.
 
 // Returns the size of the string.
 // Returns the capacity of the string buffer.  It should not be considered safe
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java
index 953453ab63b..e8fa2db9789 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java
@@ -84,9 +84,8 @@ private AudioSpectrogram(Operation operation) {
   )
   public static AudioSpectrogram create(Scope scope, Operand<TFloat32> input, Long windowSize,
       Long stride, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AudioSpectrogram"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AudioSpectrogram");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("window_size", windowSize);
     opBuilder.setAttr("stride", stride);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java
index 7c52e765255..ed0fbc78f59 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java
@@ -75,9 +75,8 @@ private DecodeWav(Operation operation) {
       describeByClass = true
   )
   public static DecodeWav create(Scope scope, Operand<TString> contents, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeWav"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeWav");
     opBuilder.addInput(contents.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.desiredChannels != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java
index 33007a9dd56..242dac20819 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java
@@ -67,10 +67,9 @@ private EncodeWav(Operation operation) {
       describeByClass = true
   )
   public static EncodeWav create(Scope scope, Operand<TFloat32> audio, Operand<TInt32> sampleRate) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeWav"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EncodeWav");
     opBuilder.addInput(audio.asOutput());
     opBuilder.addInput(sampleRate.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new EncodeWav(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java
index 7ed896394aa..bc76f03920f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java
@@ -69,10 +69,9 @@ private Mfcc(Operation operation) {
   )
   public static Mfcc create(Scope scope, Operand<TFloat32> spectrogram, Operand<TInt32> sampleRate,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mfcc"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Mfcc");
     opBuilder.addInput(spectrogram.asOutput());
     opBuilder.addInput(sampleRate.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.upperFrequencyLimit != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java
index 130d6f5179b..a4723f1eca5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java
@@ -79,10 +79,9 @@ private BitwiseAnd(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BitwiseAnd<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BitwiseAnd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BitwiseAnd");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BitwiseAnd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java
index ce511138fd1..a69cd3e282d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java
@@ -79,10 +79,9 @@ private BitwiseOr(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BitwiseOr<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BitwiseOr"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BitwiseOr");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BitwiseOr<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java
index cd843a187b3..98123299b7e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java
@@ -79,10 +79,9 @@ private BitwiseXor(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BitwiseXor<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BitwiseXor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BitwiseXor");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BitwiseXor<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java
index 5b6c115c237..cf052eb2235 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java
@@ -99,9 +99,8 @@ private Invert(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Invert<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Invert"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Invert");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Invert<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java
index 6bc1d9e6db5..bad49a692a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java
@@ -90,10 +90,9 @@ private LeftShift(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> LeftShift<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LeftShift"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LeftShift");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LeftShift<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java
index 54e2d7ad3c6..b633e0c4d0f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java
@@ -92,10 +92,9 @@ private RightShift(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RightShift<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RightShift"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RightShift");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RightShift<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java
index 420db07958b..76ed4d0228e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java
@@ -62,10 +62,9 @@ private KMC2ChainInitialization(Operation operation) {
   )
   public static KMC2ChainInitialization create(Scope scope, Operand<TFloat32> distances,
       Operand<TInt64> seed) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("KMC2ChainInitialization"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "KMC2ChainInitialization");
     opBuilder.addInput(distances.asOutput());
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new KMC2ChainInitialization(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java
index 4bb144c3006..b73162109f7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java
@@ -66,12 +66,11 @@ private KmeansPlusPlusInitialization(Operation operation) {
   )
   public static KmeansPlusPlusInitialization create(Scope scope, Operand<TFloat32> points,
       Operand<TInt64> numToSample, Operand<TInt64> seed, Operand<TInt64> numRetriesPerSample) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("KmeansPlusPlusInitialization"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "KmeansPlusPlusInitialization");
     opBuilder.addInput(points.asOutput());
     opBuilder.addInput(numToSample.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(numRetriesPerSample.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new KmeansPlusPlusInitialization(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java
index e3c2b791e16..5404521a40f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java
@@ -71,9 +71,8 @@ private AllReduce(Operation operation) {
   public static <T extends TNumber> AllReduce<T> create(Scope scope, Operand<T> input,
       Long groupSize, Long groupKey, Long instanceKey, String mergeOp, String finalOp,
       List<Long> subdivOffsets, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AllReduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AllReduce");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("group_size", groupSize);
     opBuilder.setAttr("group_key", groupKey);
     opBuilder.setAttr("instance_key", instanceKey);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java
index 922b66c56d5..2db3893987d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java
@@ -65,8 +65,7 @@ private BroadcastRecv(Operation operation) {
   )
   public static <T extends TType> BroadcastRecv<T> create(Scope scope, Class<T> T, Long groupSize,
       Long groupKey, Long instanceKey, Shape shape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastRecv"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BroadcastRecv");
     opBuilder.setAttr("T", Operands.toDataType(T));
     opBuilder.setAttr("group_size", groupSize);
     opBuilder.setAttr("group_key", groupKey);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java
index 784246929ab..fb6edd95351 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java
@@ -64,9 +64,8 @@ private BroadcastSend(Operation operation) {
   )
   public static <T extends TType> BroadcastSend<T> create(Scope scope, Operand<T> input,
       Long groupSize, Long groupKey, Long instanceKey, Shape shape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastSend"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BroadcastSend");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("group_size", groupSize);
     opBuilder.setAttr("group_key", groupKey);
     opBuilder.setAttr("instance_key", instanceKey);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Gather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Gather.java
index 3acd91096b2..2a1a3b7b41f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Gather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Gather.java
@@ -64,9 +64,8 @@ private Gather(Operation operation) {
   )
   public static <T extends TNumber> Gather<T> create(Scope scope, Operand<T> input, Long groupSize,
       Long groupKey, Long instanceKey, Shape shape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Gather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Gather");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("group_size", groupSize);
     opBuilder.setAttr("group_key", groupKey);
     opBuilder.setAttr("instance_key", instanceKey);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/GatherV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/GatherV2.java
index abc7d8728d3..2900c31041e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/GatherV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/GatherV2.java
@@ -67,13 +67,12 @@ private GatherV2(Operation operation) {
   public static <T extends TNumber> GatherV2<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> groupSize, Operand<TInt32> groupKey, Operand<TInt32> instanceKey,
       Iterable<Operand<? extends TType>> orderingToken, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GatherV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GatherV2");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(groupSize.asOutput());
     opBuilder.addInput(groupKey.asOutput());
     opBuilder.addInput(instanceKey.asOutput());
     opBuilder.addInputList(Operands.asOutputs(orderingToken));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.communicationHint != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Reduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Reduce.java
index 62d913030c1..cf4bc4328c1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Reduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Reduce.java
@@ -68,9 +68,8 @@ private Reduce(Operation operation) {
   public static <T extends TNumber> Reduce<T> create(Scope scope, Operand<T> input, Long groupSize,
       Long groupKey, Long instanceKey, String mergeOp, String finalOp, List<Long> subdivOffsets,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Reduce");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("group_size", groupSize);
     opBuilder.setAttr("group_key", groupKey);
     opBuilder.setAttr("instance_key", instanceKey);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/ReduceV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/ReduceV2.java
index 42912daf5f5..77a5b8eade4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/ReduceV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/ReduceV2.java
@@ -70,13 +70,12 @@ public static <T extends TNumber> ReduceV2<T> create(Scope scope, Operand<T> inp
       Operand<TInt32> groupSize, Operand<TInt32> groupKey, Operand<TInt32> instanceKey,
       Iterable<Operand<? extends TType>> orderingToken, String mergeOp, String finalOp,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceV2");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(groupSize.asOutput());
     opBuilder.addInput(groupKey.asOutput());
     opBuilder.addInput(instanceKey.asOutput());
     opBuilder.addInputList(Operands.asOutputs(orderingToken));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("merge_op", mergeOp);
     opBuilder.setAttr("final_op", finalOp);
     if (options != null) {
@@ -90,6 +89,9 @@ public static <T extends TNumber> ReduceV2<T> create(Scope scope, Operand<T> inp
         if (opts.NorderingToken != null) {
           opBuilder.setAttr("Nordering_token", opts.NorderingToken);
         }
+        if (opts.maxSubdivsPerDevice != null) {
+          opBuilder.setAttr("max_subdivs_per_device", opts.maxSubdivsPerDevice);
+        }
       }
     }
     return new ReduceV2<>(opBuilder.build());
@@ -125,6 +127,16 @@ public static Options NorderingToken(Long NorderingToken) {
     return new Options().NorderingToken(NorderingToken);
   }
 
+  /**
+   * Sets the maxSubdivsPerDevice option.
+   *
+   * @param maxSubdivsPerDevice the maxSubdivsPerDevice option
+   * @return this Options instance.
+   */
+  public static Options maxSubdivsPerDevice(Long maxSubdivsPerDevice) {
+    return new Options().maxSubdivsPerDevice(maxSubdivsPerDevice);
+  }
+
   /**
    * Gets data.
    *
@@ -149,6 +161,8 @@ public static class Options {
 
     private Long NorderingToken;
 
+    private Long maxSubdivsPerDevice;
+
     private Options() {
     }
 
@@ -184,5 +198,16 @@ public Options NorderingToken(Long NorderingToken) {
       this.NorderingToken = NorderingToken;
       return this;
     }
+
+    /**
+     * Sets the maxSubdivsPerDevice option.
+     *
+     * @param maxSubdivsPerDevice the maxSubdivsPerDevice option
+     * @return this Options instance.
+     */
+    public Options maxSubdivsPerDevice(Long maxSubdivsPerDevice) {
+      this.maxSubdivsPerDevice = maxSubdivsPerDevice;
+      return this;
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java
index 4fc67af11fc..850854a9523 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java
@@ -52,8 +52,7 @@ private Abort(Operation operation) {
       describeByClass = true
   )
   public static Abort create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Abort"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Abort");
     if (options != null) {
       for (Options opts : options) {
         if (opts.errorMsg != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java
index b0f51547809..58a16e2306b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java
@@ -65,10 +65,9 @@ private All(Operation operation) {
   )
   public static All create(Scope scope, Operand<TBool> input, Operand<? extends TNumber> axis,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("All"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "All");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java
index 5f8eb0cfdbd..a629c8d4895 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java
@@ -65,10 +65,9 @@ private Any(Operation operation) {
   )
   public static Any create(Scope scope, Operand<TBool> input, Operand<? extends TNumber> axis,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Any"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Any");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java
index e3cb2b4dcfe..58afa56676c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java
@@ -57,10 +57,9 @@ private AssertThat(Operation operation) {
   )
   public static AssertThat create(Scope scope, Operand<TBool> condition, Iterable<Operand<?>> data,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssertThat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssertThat");
     opBuilder.addInput(condition.asOutput());
     opBuilder.addInputList(Operands.asOutputs(data));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.summarize != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java
index aed03cfb7a1..4ad9ca40e03 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java
@@ -64,10 +64,9 @@ private Assign(Operation operation) {
   )
   public static <T extends TType> Assign<T> create(Scope scope, Operand<T> ref, Operand<T> value,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Assign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Assign");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.validateShape != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java
index 427cea1db9a..fd8b3bcc793 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java
@@ -64,10 +64,9 @@ private AssignAdd(Operation operation) {
   )
   public static <T extends TType> AssignAdd<T> create(Scope scope, Operand<T> ref, Operand<T> value,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssignAdd");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java
index aabcd9e756b..10e0c5cd327 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java
@@ -55,10 +55,9 @@ private AssignAddVariableOp(Operation operation) {
   )
   public static AssignAddVariableOp create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TType> value) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignAddVariableOp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssignAddVariableOp");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AssignAddVariableOp(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSub.java
index 68569e36fc5..dbba967ad2f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSub.java
@@ -64,10 +64,9 @@ private AssignSub(Operation operation) {
   )
   public static <T extends TType> AssignSub<T> create(Scope scope, Operand<T> ref, Operand<T> value,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignSub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssignSub");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java
index 6501d4c070f..2821427195c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java
@@ -55,10 +55,9 @@ private AssignSubVariableOp(Operation operation) {
   )
   public static AssignSubVariableOp create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TType> value) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignSubVariableOp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssignSubVariableOp");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AssignSubVariableOp(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java
index f186649e329..a8d89c838c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java
@@ -55,10 +55,9 @@ private AssignVariableOp(Operation operation) {
   )
   public static AssignVariableOp create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TType> value) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignVariableOp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssignVariableOp");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AssignVariableOp(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Barrier.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Barrier.java
index 4cbd38c0b15..eb042cce417 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Barrier.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Barrier.java
@@ -70,8 +70,7 @@ private Barrier(Operation operation) {
   )
   public static Barrier create(Scope scope, List<Class<? extends TType>> componentTypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Barrier"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Barrier");
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierClose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierClose.java
index ec1e6abb01d..6d2a912722c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierClose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierClose.java
@@ -58,9 +58,8 @@ private BarrierClose(Operation operation) {
       describeByClass = true
   )
   public static BarrierClose create(Scope scope, Operand<TString> handle, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierClose"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BarrierClose");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.cancelPendingEnqueues != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierIncompleteSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierIncompleteSize.java
index e08c9d8479d..4b4e7f1f3e5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierIncompleteSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierIncompleteSize.java
@@ -57,9 +57,8 @@ private BarrierIncompleteSize(Operation operation) {
       describeByClass = true
   )
   public static BarrierIncompleteSize create(Scope scope, Operand<TString> handle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierIncompleteSize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BarrierIncompleteSize");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BarrierIncompleteSize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java
index 5569ea03f02..371cc0b7c16 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java
@@ -61,11 +61,10 @@ private BarrierInsertMany(Operation operation) {
   )
   public static BarrierInsertMany create(Scope scope, Operand<TString> handle,
       Operand<TString> keys, Operand<? extends TType> values, Long componentIndex) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierInsertMany"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BarrierInsertMany");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(keys.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("component_index", componentIndex);
     return new BarrierInsertMany(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierReadySize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierReadySize.java
index 8be08271082..df7cf5cc40e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierReadySize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierReadySize.java
@@ -57,9 +57,8 @@ private BarrierReadySize(Operation operation) {
       describeByClass = true
   )
   public static BarrierReadySize create(Scope scope, Operand<TString> handle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierReadySize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BarrierReadySize");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BarrierReadySize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierTakeMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierTakeMany.java
index 2b480131f06..72ee2fcc356 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierTakeMany.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierTakeMany.java
@@ -83,10 +83,9 @@ private BarrierTakeMany(Operation operation) {
   public static BarrierTakeMany create(Scope scope, Operand<TString> handle,
       Operand<TInt32> numElements, List<Class<? extends TType>> componentTypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierTakeMany"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BarrierTakeMany");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(numElements.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Batch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Batch.java
index 7b155fcbcb2..af01b21cadf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Batch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Batch.java
@@ -105,9 +105,8 @@ private Batch(Operation operation) {
   )
   public static Batch create(Scope scope, Iterable<Operand<?>> inTensors, Long numBatchThreads,
       Long maxBatchSize, Long batchTimeoutMicros, Long gradTimeoutMicros, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Batch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Batch");
     opBuilder.addInputList(Operands.asOutputs(inTensors));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_batch_threads", numBatchThreads);
     opBuilder.setAttr("max_batch_size", maxBatchSize);
     opBuilder.setAttr("batch_timeout_micros", batchTimeoutMicros);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchFunction.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchFunction.java
index db64e937645..f59367caae1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchFunction.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchFunction.java
@@ -109,10 +109,9 @@ public static BatchFunction create(Scope scope, Iterable<Operand<?>> inTensors,
       Iterable<Operand<?>> capturedTensors, ConcreteFunction f, Long numBatchThreads,
       Long maxBatchSize, Long batchTimeoutMicros, List<Class<? extends TType>> Tout,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchFunction"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchFunction");
     opBuilder.addInputList(Operands.asOutputs(inTensors));
     opBuilder.addInputList(Operands.asOutputs(capturedTensors));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("num_batch_threads", numBatchThreads);
     opBuilder.setAttr("max_batch_size", maxBatchSize);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java
index e908a1bb72a..b465736a7d7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java
@@ -76,10 +76,9 @@ private BatchToSpace(Operation operation) {
   )
   public static <T extends TType> BatchToSpace<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> crops, Long blockSize) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchToSpace"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchToSpace");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(crops.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("block_size", blockSize);
     return new BatchToSpace<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java
index 5f5067ebebe..819550b066d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java
@@ -160,11 +160,10 @@ private BatchToSpaceNd(Operation operation) {
   )
   public static <T extends TType> BatchToSpaceNd<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> blockShape, Operand<? extends TNumber> crops) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchToSpaceNd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchToSpaceNd");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(blockShape.asOutput());
     opBuilder.addInput(crops.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchToSpaceNd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java
index cb2cffd1dd5..027d11b822f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java
@@ -120,9 +120,8 @@ private Bitcast(Operation operation) {
   )
   public static <U extends TType> Bitcast<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> type) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Bitcast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Bitcast");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     return new Bitcast<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastDynamicShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastDynamicShape.java
index d081f39c50f..850d7db1a2f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastDynamicShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastDynamicShape.java
@@ -63,10 +63,9 @@ private BroadcastDynamicShape(Operation operation) {
   )
   public static <T extends TNumber> BroadcastDynamicShape<T> create(Scope scope, Operand<T> s0,
       Operand<T> s1) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastDynamicShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BroadcastDynamicShape");
     opBuilder.addInput(s0.asOutput());
     opBuilder.addInput(s1.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BroadcastDynamicShape<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastGradientArgs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastGradientArgs.java
index 6264a26ccbf..f1b36da9a40 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastGradientArgs.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastGradientArgs.java
@@ -63,10 +63,9 @@ private BroadcastGradientArgs(Operation operation) {
   )
   public static <T extends TNumber> BroadcastGradientArgs<T> create(Scope scope, Operand<T> s0,
       Operand<T> s1) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastGradientArgs"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BroadcastGradientArgs");
     opBuilder.addInput(s0.asOutput());
     opBuilder.addInput(s1.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BroadcastGradientArgs<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java
index 2e8dd8c5668..deb648f6e2f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java
@@ -90,10 +90,9 @@ private BroadcastTo(Operation operation) {
   )
   public static <T extends TType> BroadcastTo<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastTo"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BroadcastTo");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BroadcastTo<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java
index cfe1db8d428..24fecab9660 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java
@@ -69,9 +69,8 @@ private Bucketize(Operation operation) {
   )
   public static Bucketize create(Scope scope, Operand<? extends TNumber> input,
       List<Float> boundaries) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Bucketize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Bucketize");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     float[] boundariesArray = new float[boundaries.size()];
     for (int i = 0 ; i < boundariesArray.length ; i++) {
       boundariesArray[i] = boundaries.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ClipByValue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ClipByValue.java
index 8e26025c2d7..938a931b78d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ClipByValue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ClipByValue.java
@@ -68,11 +68,10 @@ private ClipByValue(Operation operation) {
   )
   public static <T extends TType> ClipByValue<T> create(Scope scope, Operand<T> t,
       Operand<T> clipValueMin, Operand<T> clipValueMax) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ClipByValue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ClipByValue");
     opBuilder.addInput(t.asOutput());
     opBuilder.addInput(clipValueMin.asOutput());
     opBuilder.addInput(clipValueMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ClipByValue<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CollectiveGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CollectiveGather.java
index 84df176b3aa..8ab6435aff9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CollectiveGather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CollectiveGather.java
@@ -67,9 +67,8 @@ private CollectiveGather(Operation operation) {
   )
   public static <T extends TNumber> CollectiveGather<T> create(Scope scope, Operand<T> input,
       Long groupSize, Long groupKey, Long instanceKey, Shape shape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CollectiveGather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CollectiveGather");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("group_size", groupSize);
     opBuilder.setAttr("group_key", groupKey);
     opBuilder.setAttr("instance_key", instanceKey);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CompositeTensorVariantFromComponents.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CompositeTensorVariantFromComponents.java
new file mode 100644
index 00000000000..f8afbadb121
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CompositeTensorVariantFromComponents.java
@@ -0,0 +1,84 @@
+/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================*/
+
+// This class has been generated, DO NOT EDIT!
+
+package org.tensorflow.op.core;
+
+import org.tensorflow.Operand;
+import org.tensorflow.Operation;
+import org.tensorflow.OperationBuilder;
+import org.tensorflow.Output;
+import org.tensorflow.op.Operands;
+import org.tensorflow.op.RawOp;
+import org.tensorflow.op.Scope;
+import org.tensorflow.op.annotation.Endpoint;
+import org.tensorflow.types.family.TType;
+
+/**
+ * Encodes an {@code ExtensionType} value into a {@code variant} scalar Tensor.
+ * Returns a scalar variant tensor containing a single {@code CompositeTensorVariant}
+ * with the specified Tensor components and TypeSpec.
+ */
+public final class CompositeTensorVariantFromComponents extends RawOp implements Operand<TType> {
+  /**
+   * The name of this op, as known by TensorFlow core engine
+   */
+  public static final String OP_NAME = "CompositeTensorVariantFromComponents";
+
+  private Output<? extends TType> encoded;
+
+  @SuppressWarnings("unchecked")
+  private CompositeTensorVariantFromComponents(Operation operation) {
+    super(operation);
+    int outputIdx = 0;
+    encoded = operation.output(outputIdx++);
+  }
+
+  /**
+   * Factory method to create a class wrapping a new CompositeTensorVariantFromComponents operation.
+   *
+   * @param scope current scope
+   * @param components The component tensors for the extension type value.
+   * @param metadata String serialization for the TypeSpec.  (Note: the encoding for the TypeSpec
+   * may change in future versions of TensorFlow.)
+   * @return a new instance of CompositeTensorVariantFromComponents
+   */
+  @Endpoint(
+      describeByClass = true
+  )
+  public static CompositeTensorVariantFromComponents create(Scope scope,
+      Iterable<Operand<?>> components, String metadata) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CompositeTensorVariantFromComponents");
+    opBuilder.addInputList(Operands.asOutputs(components));
+    opBuilder.setAttr("metadata", metadata);
+    return new CompositeTensorVariantFromComponents(opBuilder.build());
+  }
+
+  /**
+   * Gets encoded.
+   * A {@code variant} Tensor that containing the encoded value.
+   * @return encoded.
+   */
+  public Output<? extends TType> encoded() {
+    return encoded;
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public Output<TType> asOutput() {
+    return (Output<TType>) encoded;
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CompositeTensorVariantToComponents.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CompositeTensorVariantToComponents.java
new file mode 100644
index 00000000000..3dbad9c91b7
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CompositeTensorVariantToComponents.java
@@ -0,0 +1,93 @@
+/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================*/
+
+// This class has been generated, DO NOT EDIT!
+
+package org.tensorflow.op.core;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import org.tensorflow.Operand;
+import org.tensorflow.Operation;
+import org.tensorflow.OperationBuilder;
+import org.tensorflow.Output;
+import org.tensorflow.op.Operands;
+import org.tensorflow.op.RawOp;
+import org.tensorflow.op.Scope;
+import org.tensorflow.op.annotation.Endpoint;
+import org.tensorflow.types.family.TType;
+
+/**
+ * Decodes a {@code variant} scalar Tensor into an {@code ExtensionType} value.
+ * Returns the Tensor components encoded in a {@code CompositeTensorVariant}.
+ * <p>Raises an error if {@code type_spec_proto} doesn't match the TypeSpec
+ * in {@code encoded}.
+ */
+public final class CompositeTensorVariantToComponents extends RawOp implements Iterable<Operand<TType>> {
+  /**
+   * The name of this op, as known by TensorFlow core engine
+   */
+  public static final String OP_NAME = "CompositeTensorVariantToComponents";
+
+  private List<Output<?>> components;
+
+  @SuppressWarnings("unchecked")
+  private CompositeTensorVariantToComponents(Operation operation) {
+    super(operation);
+    int outputIdx = 0;
+    int componentsLength = operation.outputListLength("components");
+    components = Arrays.asList(operation.outputList(outputIdx, componentsLength));
+    outputIdx += componentsLength;
+  }
+
+  /**
+   * Factory method to create a class wrapping a new CompositeTensorVariantToComponents operation.
+   *
+   * @param scope current scope
+   * @param encoded A scalar {@code variant} Tensor containing an encoded ExtensionType value.
+   * @param metadata String serialization for the TypeSpec.  Must be compatible with the
+   * {@code TypeSpec} contained in {@code encoded}.  (Note: the encoding for the TypeSpec
+   * may change in future versions of TensorFlow.)
+   * @param Tcomponents Expected dtypes for components.
+   * @return a new instance of CompositeTensorVariantToComponents
+   */
+  @Endpoint(
+      describeByClass = true
+  )
+  public static CompositeTensorVariantToComponents create(Scope scope,
+      Operand<? extends TType> encoded, String metadata, List<Class<? extends TType>> Tcomponents) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CompositeTensorVariantToComponents");
+    opBuilder.addInput(encoded.asOutput());
+    opBuilder.setAttr("metadata", metadata);
+    opBuilder.setAttr("Tcomponents", Operands.toDataTypes(Tcomponents));
+    return new CompositeTensorVariantToComponents(opBuilder.build());
+  }
+
+  /**
+   * Gets components.
+   * The component tensors for the ExtensionType value in {@code encoded}.
+   * @return components.
+   */
+  public List<Output<?>> components() {
+    return components;
+  }
+
+  @Override
+  @SuppressWarnings({"rawtypes", "unchecked"})
+  public Iterator<Operand<TType>> iterator() {
+    return (Iterator) components.iterator();
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java
index 3244d20c649..80e2a2fe207 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java
@@ -65,10 +65,9 @@ private Concat(Operation operation) {
   )
   public static <T extends TType> Concat<T> create(Scope scope, Iterable<Operand<T>> values,
       Operand<? extends TNumber> axis) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Concat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Concat");
     opBuilder.addInputList(Operands.asOutputs(values));
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Concat<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ConsumeMutexLock.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ConsumeMutexLock.java
index a48e91b6ebd..9dc127e3d70 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ConsumeMutexLock.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ConsumeMutexLock.java
@@ -57,9 +57,8 @@ private ConsumeMutexLock(Operation operation) {
       describeByClass = true
   )
   public static ConsumeMutexLock create(Scope scope, Operand<? extends TType> mutexLock) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConsumeMutexLock"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ConsumeMutexLock");
     opBuilder.addInput(mutexLock.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ConsumeMutexLock(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ControlTrigger.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ControlTrigger.java
index a83912d608d..b60a6f674b0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ControlTrigger.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ControlTrigger.java
@@ -49,8 +49,7 @@ private ControlTrigger(Operation operation) {
       describeByClass = true
   )
   public static ControlTrigger create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ControlTrigger"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ControlTrigger");
     return new ControlTrigger(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Copy.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Copy.java
index f31cc35dc83..d8e9700422e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Copy.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Copy.java
@@ -68,9 +68,8 @@ private Copy(Operation operation) {
   )
   public static <T extends TType> Copy<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Copy"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Copy");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.tensorName != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CopyHost.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CopyHost.java
index 6e7495f17f1..3c348d13929 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CopyHost.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CopyHost.java
@@ -66,9 +66,8 @@ private CopyHost(Operation operation) {
   )
   public static <T extends TType> CopyHost<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CopyHost"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CopyHost");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.tensorName != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CountUpTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CountUpTo.java
index 17db07035b8..d84ead6e789 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CountUpTo.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CountUpTo.java
@@ -61,9 +61,8 @@ private CountUpTo(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> CountUpTo<T> create(Scope scope, Operand<T> ref, Long limit) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CountUpTo"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CountUpTo");
     opBuilder.addInput(ref.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("limit", limit);
     return new CountUpTo<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DecodeProto.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DecodeProto.java
index d0c32ff2601..1668fc15c89 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DecodeProto.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DecodeProto.java
@@ -124,9 +124,8 @@ private DecodeProto(Operation operation) {
   )
   public static DecodeProto create(Scope scope, Operand<TString> bytes, String messageType,
       List<String> fieldNames, List<Class<? extends TType>> outputTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeProto"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeProto");
     opBuilder.addInput(bytes.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("message_type", messageType);
     String[] fieldNamesArray = new String[fieldNames.size()];
     for (int i = 0 ; i < fieldNamesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeepCopy.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeepCopy.java
index b5662c7ae3d..8826f1d4a67 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeepCopy.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeepCopy.java
@@ -59,9 +59,8 @@ private DeepCopy(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> DeepCopy<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeepCopy"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeepCopy");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DeepCopy<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeleteSessionTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeleteSessionTensor.java
index bd971e462e2..e2438b7d763 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeleteSessionTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeleteSessionTensor.java
@@ -51,9 +51,8 @@ private DeleteSessionTensor(Operation operation) {
       describeByClass = true
   )
   public static DeleteSessionTensor create(Scope scope, Operand<TString> handle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteSessionTensor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeleteSessionTensor");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DeleteSessionTensor(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyResourceOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyResourceOp.java
index d421e61e929..712a226b7f9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyResourceOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyResourceOp.java
@@ -55,9 +55,8 @@ private DestroyResourceOp(Operation operation) {
   )
   public static DestroyResourceOp create(Scope scope, Operand<? extends TType> resource,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DestroyResourceOp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DestroyResourceOp");
     opBuilder.addInput(resource.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.ignoreLookupError != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyTemporaryVariable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyTemporaryVariable.java
index cd6a18100fc..7fb5b12b2c5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyTemporaryVariable.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyTemporaryVariable.java
@@ -68,9 +68,8 @@ private DestroyTemporaryVariable(Operation operation) {
   )
   public static <T extends TType> DestroyTemporaryVariable<T> create(Scope scope, Operand<T> ref,
       String varName) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DestroyTemporaryVariable"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DestroyTemporaryVariable");
     opBuilder.addInput(ref.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("var_name", varName);
     return new DestroyTemporaryVariable<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeviceIndex.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeviceIndex.java
index 4e947cb254a..de834ee3fb4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeviceIndex.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeviceIndex.java
@@ -59,8 +59,7 @@ private DeviceIndex(Operation operation) {
       describeByClass = true
   )
   public static DeviceIndex create(Scope scope, List<String> deviceNames) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeviceIndex"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeviceIndex");
     String[] deviceNamesArray = new String[deviceNames.size()];
     for (int i = 0 ; i < deviceNamesArray.length ; i++) {
       deviceNamesArray[i] = deviceNames.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummyMemoryCache.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummyMemoryCache.java
index 32e5713b0b3..dd24b4a64af 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummyMemoryCache.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummyMemoryCache.java
@@ -54,8 +54,7 @@ private DummyMemoryCache(Operation operation) {
       describeByClass = true
   )
   public static DummyMemoryCache create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DummyMemoryCache"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DummyMemoryCache");
     return new DummyMemoryCache(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicPartition.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicPartition.java
index 277f44372db..f777b6b2f70 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicPartition.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicPartition.java
@@ -100,10 +100,9 @@ private DynamicPartition(Operation operation) {
   )
   public static <T extends TType> DynamicPartition<T> create(Scope scope, Operand<T> data,
       Operand<TInt32> partitions, Long numPartitions) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DynamicPartition"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DynamicPartition");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(partitions.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_partitions", numPartitions);
     return new DynamicPartition<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicStitch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicStitch.java
index c314c0b2440..5cbf9e59a1d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicStitch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicStitch.java
@@ -116,10 +116,9 @@ private DynamicStitch(Operation operation) {
   )
   public static <T extends TType> DynamicStitch<T> create(Scope scope,
       Iterable<Operand<TInt32>> indices, Iterable<Operand<T>> data) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DynamicStitch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DynamicStitch");
     opBuilder.addInputList(Operands.asOutputs(indices));
     opBuilder.addInputList(Operands.asOutputs(data));
-    opBuilder = scope.apply(opBuilder);
     return new DynamicStitch<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EditDistance.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EditDistance.java
index a302596aea3..266d2c3c6c6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EditDistance.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EditDistance.java
@@ -78,14 +78,13 @@ public static <T extends TType> EditDistance create(Scope scope,
       Operand<TInt64> hypothesisIndices, Operand<T> hypothesisValues,
       Operand<TInt64> hypothesisShape, Operand<TInt64> truthIndices, Operand<T> truthValues,
       Operand<TInt64> truthShape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EditDistance"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EditDistance");
     opBuilder.addInput(hypothesisIndices.asOutput());
     opBuilder.addInput(hypothesisValues.asOutput());
     opBuilder.addInput(hypothesisShape.asOutput());
     opBuilder.addInput(truthIndices.asOutput());
     opBuilder.addInput(truthValues.asOutput());
     opBuilder.addInput(truthShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.normalize != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Empty.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Empty.java
index c59b5088a57..e83fc532726 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Empty.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Empty.java
@@ -65,9 +65,8 @@ private Empty(Operation operation) {
   )
   public static <T extends TType> Empty<T> create(Scope scope, Operand<TInt32> shape,
       Class<T> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Empty"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Empty");
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java
index f7ca73ecba5..5d96174e298 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java
@@ -70,10 +70,9 @@ private EmptyTensorList(Operation operation) {
   public static <U extends TType> EmptyTensorList create(Scope scope,
       Operand<? extends TNumber> elementShape, Operand<TInt32> maxNumElements,
       Class<U> elementDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EmptyTensorList"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EmptyTensorList");
     opBuilder.addInput(elementShape.asOutput());
     opBuilder.addInput(maxNumElements.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("element_dtype", Operands.toDataType(elementDtype));
     return new EmptyTensorList(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorMap.java
index 336ec9ae30c..7bb4274e2b5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorMap.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorMap.java
@@ -57,8 +57,7 @@ private EmptyTensorMap(Operation operation) {
       describeByClass = true
   )
   public static EmptyTensorMap create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EmptyTensorMap"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EmptyTensorMap");
     return new EmptyTensorMap(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EncodeProto.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EncodeProto.java
index b640e15d503..14ea6f4a3a1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EncodeProto.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EncodeProto.java
@@ -109,10 +109,9 @@ private EncodeProto(Operation operation) {
   )
   public static EncodeProto create(Scope scope, Operand<TInt32> sizes, Iterable<Operand<?>> values,
       List<String> fieldNames, String messageType, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeProto"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EncodeProto");
     opBuilder.addInput(sizes.asOutput());
     opBuilder.addInputList(Operands.asOutputs(values));
-    opBuilder = scope.apply(opBuilder);
     String[] fieldNamesArray = new String[fieldNames.size()];
     for (int i = 0 ; i < fieldNamesArray.length ; i++) {
       fieldNamesArray[i] = fieldNames.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EnsureShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EnsureShape.java
index dbe6942d163..26575671b80 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EnsureShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EnsureShape.java
@@ -64,9 +64,8 @@ private EnsureShape(Operation operation) {
   )
   public static <T extends TType> EnsureShape<T> create(Scope scope, Operand<T> input,
       Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnsureShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EnsureShape");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("shape", shape);
     return new EnsureShape<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Enter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Enter.java
index a7612acd1c5..6451e8e8c5a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Enter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Enter.java
@@ -65,9 +65,8 @@ private Enter(Operation operation) {
   )
   public static <T extends TType> Enter<T> create(Scope scope, Operand<T> data, String frameName,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Enter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Enter");
     opBuilder.addInput(data.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("frame_name", frameName);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Exit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Exit.java
index 26ecefa0494..d9cc8f881bd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Exit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Exit.java
@@ -58,9 +58,8 @@ private Exit(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Exit<T> create(Scope scope, Operand<T> data) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Exit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Exit");
     opBuilder.addInput(data.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Exit<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java
index 36442b72024..b5382bba07f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java
@@ -87,10 +87,9 @@ private ExpandDims(Operation operation) {
   )
   public static <T extends TType> ExpandDims<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExpandDims"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ExpandDims");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ExpandDims<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExtractVolumePatches.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExtractVolumePatches.java
index ea431071365..9326536a87b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExtractVolumePatches.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExtractVolumePatches.java
@@ -70,9 +70,8 @@ private ExtractVolumePatches(Operation operation) {
   )
   public static <T extends TNumber> ExtractVolumePatches<T> create(Scope scope, Operand<T> input,
       List<Long> ksizes, List<Long> strides, String padding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExtractVolumePatches"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ExtractVolumePatches");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizesArray = new long[ksizes.size()];
     for (int i = 0 ; i < ksizesArray.length ; i++) {
       ksizesArray[i] = ksizes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java
index 1405a16d0be..c4f7cd0e435 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java
@@ -82,10 +82,9 @@ private Fill(Operation operation) {
   )
   public static <U extends TType> Fill<U> create(Scope scope, Operand<? extends TNumber> dims,
       Operand<U> value) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fill"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Fill");
     opBuilder.addInput(dims.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Fill<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java
index 337dc5b85c6..ed232337e3f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java
@@ -84,10 +84,9 @@ private Fingerprint(Operation operation) {
   )
   public static Fingerprint create(Scope scope, Operand<? extends TType> data,
       Operand<TString> method) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fingerprint"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Fingerprint");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(method.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Fingerprint(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/For.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/For.java
index 96392a1a3cc..5cd95205c5e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/For.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/For.java
@@ -78,12 +78,11 @@ private For(Operation operation) {
   )
   public static For create(Scope scope, Operand<TInt32> start, Operand<TInt32> limit,
       Operand<TInt32> delta, Iterable<Operand<?>> input, ConcreteFunction body) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("For"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "For");
     opBuilder.addInput(start.asOutput());
     opBuilder.addInput(limit.asOutput());
     opBuilder.addInput(delta.asOutput());
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("body", body);
     return new For(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java
index d2b330568f6..62b2184b690 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java
@@ -88,11 +88,10 @@ private Gather(Operation operation) {
   )
   public static <T extends TType> Gather<T> create(Scope scope, Operand<T> params,
       Operand<? extends TNumber> indices, Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Gather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Gather");
     opBuilder.addInput(params.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.batchDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java
index f57c56e41cf..3d0b72d0985 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java
@@ -151,10 +151,9 @@ private GatherNd(Operation operation) {
   )
   public static <T extends TType> GatherNd<T> create(Scope scope, Operand<T> params,
       Operand<? extends TNumber> indices) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GatherNd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GatherNd");
     opBuilder.addInput(params.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new GatherNd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java
index 876072b7222..ddc417fe239 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java
@@ -57,9 +57,8 @@ private GetSessionHandle(Operation operation) {
       describeByClass = true
   )
   public static GetSessionHandle create(Scope scope, Operand<? extends TType> value) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GetSessionHandle"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GetSessionHandle");
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new GetSessionHandle(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionTensor.java
index 319ac2b0ac9..f49527c73eb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionTensor.java
@@ -63,9 +63,8 @@ private GetSessionTensor(Operation operation) {
   )
   public static <T extends TType> GetSessionTensor<T> create(Scope scope, Operand<TString> handle,
       Class<T> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GetSessionTensor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GetSessionTensor");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new GetSessionTensor<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GuaranteeConst.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GuaranteeConst.java
index 5b600d66af7..12869e0b856 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GuaranteeConst.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GuaranteeConst.java
@@ -63,9 +63,8 @@ private GuaranteeConst(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> GuaranteeConst<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GuaranteeConst"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GuaranteeConst");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new GuaranteeConst<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HashTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HashTable.java
index 5063ab9d291..e29387af1b8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HashTable.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HashTable.java
@@ -66,8 +66,7 @@ private HashTable(Operation operation) {
   )
   public static <T extends TType, U extends TType> HashTable create(Scope scope, Class<T> keyDtype,
       Class<U> valueDtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("HashTable"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "HashTable");
     opBuilder.setAttr("key_dtype", Operands.toDataType(keyDtype));
     opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HistogramFixedWidth.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HistogramFixedWidth.java
index c7417683e00..0188d810dad 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HistogramFixedWidth.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HistogramFixedWidth.java
@@ -82,11 +82,10 @@ private HistogramFixedWidth(Operation operation) {
   )
   public static <U extends TNumber, T extends TNumber> HistogramFixedWidth<U> create(Scope scope,
       Operand<T> values, Operand<T> valueRange, Operand<TInt32> nbins, Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("HistogramFixedWidth"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "HistogramFixedWidth");
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(valueRange.asOutput());
     opBuilder.addInput(nbins.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new HistogramFixedWidth<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Identity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Identity.java
index 9e0f7be5a22..25cb4a0ee7e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Identity.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Identity.java
@@ -59,9 +59,8 @@ private Identity(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Identity<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Identity"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Identity");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Identity<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IdentityN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IdentityN.java
index d70d42698a0..794f2a63e4a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IdentityN.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IdentityN.java
@@ -76,9 +76,8 @@ private IdentityN(Operation operation) {
       describeByClass = true
   )
   public static IdentityN create(Scope scope, Iterable<Operand<?>> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IdentityN"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IdentityN");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     return new IdentityN(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ImmutableConst.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ImmutableConst.java
index 8c49af16350..be6d47d25ab 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ImmutableConst.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ImmutableConst.java
@@ -66,8 +66,7 @@ private ImmutableConst(Operation operation) {
   )
   public static <T extends TType> ImmutableConst<T> create(Scope scope, Class<T> dtype, Shape shape,
       String memoryRegionName) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImmutableConst"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ImmutableConst");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("shape", shape);
     opBuilder.setAttr("memory_region_name", memoryRegionName);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java
index 23c86e955c5..65156cd5a92 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java
@@ -54,11 +54,10 @@ private InitializeTable(Operation operation) {
   )
   public static InitializeTable create(Scope scope, Operand<? extends TType> tableHandle,
       Operand<? extends TType> keys, Operand<? extends TType> values) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InitializeTable"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InitializeTable");
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new InitializeTable(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTableFromTextFile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTableFromTextFile.java
index ef81b6bb3d2..27971df17b5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTableFromTextFile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTableFromTextFile.java
@@ -70,10 +70,9 @@ private InitializeTableFromTextFile(Operation operation) {
   public static InitializeTableFromTextFile create(Scope scope,
       Operand<? extends TType> tableHandle, Operand<TString> filename, Long keyIndex,
       Long valueIndex, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InitializeTableFromTextFile"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InitializeTableFromTextFile");
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(filename.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("key_index", keyIndex);
     opBuilder.setAttr("value_index", valueIndex);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceAdd.java
index fe81153c9db..42f4d90e0a6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceAdd.java
@@ -66,11 +66,10 @@ private InplaceAdd(Operation operation) {
   )
   public static <T extends TType> InplaceAdd<T> create(Scope scope, Operand<T> x, Operand<TInt32> i,
       Operand<T> v) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InplaceAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InplaceAdd");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(i.asOutput());
     opBuilder.addInput(v.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new InplaceAdd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceSub.java
index 9ed3b0011af..67be6f601a8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceSub.java
@@ -67,11 +67,10 @@ private InplaceSub(Operation operation) {
   )
   public static <T extends TType> InplaceSub<T> create(Scope scope, Operand<T> x, Operand<TInt32> i,
       Operand<T> v) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InplaceSub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InplaceSub");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(i.asOutput());
     opBuilder.addInput(v.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new InplaceSub<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceUpdate.java
index 69fca893ec2..0cdc6d077f8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceUpdate.java
@@ -66,11 +66,10 @@ private InplaceUpdate(Operation operation) {
   )
   public static <T extends TType> InplaceUpdate<T> create(Scope scope, Operand<T> x,
       Operand<TInt32> i, Operand<T> v) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InplaceUpdate"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InplaceUpdate");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(i.asOutput());
     opBuilder.addInput(v.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new InplaceUpdate<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java
index 9b2e1217dd9..30f37d85402 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java
@@ -58,9 +58,8 @@ private IsVariableInitialized(Operation operation) {
       describeByClass = true
   )
   public static IsVariableInitialized create(Scope scope, Operand<? extends TType> ref) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsVariableInitialized"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IsVariableInitialized");
     opBuilder.addInput(ref.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IsVariableInitialized(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/KthOrderStatistic.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/KthOrderStatistic.java
index a576cc8541e..000f85c7791 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/KthOrderStatistic.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/KthOrderStatistic.java
@@ -71,9 +71,8 @@ private KthOrderStatistic(Operation operation) {
       describeByClass = true
   )
   public static KthOrderStatistic create(Scope scope, Operand<TFloat32> input, Long k) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("KthOrderStatistic"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "KthOrderStatistic");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("k", k);
     return new KthOrderStatistic(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java
index 8b852ac10e7..03f9bfde2fa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java
@@ -67,11 +67,10 @@ private LinSpace(Operation operation) {
   )
   public static <T extends TNumber> LinSpace<T> create(Scope scope, Operand<T> start,
       Operand<T> stop, Operand<? extends TNumber> num) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LinSpace"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LinSpace");
     opBuilder.addInput(start.asOutput());
     opBuilder.addInput(stop.asOutput());
     opBuilder.addInput(num.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LinSpace<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableExport.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableExport.java
index 7d662618b0f..2b8b6d6c798 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableExport.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableExport.java
@@ -69,9 +69,8 @@ private LookupTableExport(Operation operation) {
   )
   public static <T extends TType, U extends TType> LookupTableExport<T, U> create(Scope scope,
       Operand<? extends TType> tableHandle, Class<T> Tkeys, Class<U> Tvalues) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableExport"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LookupTableExport");
     opBuilder.addInput(tableHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tkeys", Operands.toDataType(Tkeys));
     opBuilder.setAttr("Tvalues", Operands.toDataType(Tvalues));
     return new LookupTableExport<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java
index 16c773922c2..e7d4586a47e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java
@@ -67,11 +67,10 @@ private LookupTableFind(Operation operation) {
   public static <U extends TType> LookupTableFind<U> create(Scope scope,
       Operand<? extends TType> tableHandle, Operand<? extends TType> keys,
       Operand<U> defaultValue) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableFind"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LookupTableFind");
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
     opBuilder.addInput(defaultValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LookupTableFind<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java
index 1c76d9056dd..053f2f0091d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java
@@ -56,11 +56,10 @@ private LookupTableImport(Operation operation) {
   )
   public static LookupTableImport create(Scope scope, Operand<? extends TType> tableHandle,
       Operand<? extends TType> keys, Operand<? extends TType> values) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableImport"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LookupTableImport");
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LookupTableImport(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java
index e7b94e49d9d..f5616043057 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java
@@ -56,11 +56,10 @@ private LookupTableInsert(Operation operation) {
   )
   public static LookupTableInsert create(Scope scope, Operand<? extends TType> tableHandle,
       Operand<? extends TType> keys, Operand<? extends TType> values) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableInsert"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LookupTableInsert");
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LookupTableInsert(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java
index 8c9c0201259..c732e49e4a2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java
@@ -53,10 +53,9 @@ private LookupTableRemove(Operation operation) {
   )
   public static LookupTableRemove create(Scope scope, Operand<? extends TType> tableHandle,
       Operand<? extends TType> keys) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableRemove"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LookupTableRemove");
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(keys.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LookupTableRemove(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableSize.java
index e0cd2a31ed3..3f830d19ae6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableSize.java
@@ -57,9 +57,8 @@ private LookupTableSize(Operation operation) {
       describeByClass = true
   )
   public static LookupTableSize create(Scope scope, Operand<? extends TType> tableHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableSize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LookupTableSize");
     opBuilder.addInput(tableHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LookupTableSize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LoopCond.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LoopCond.java
index f5cbb248d29..ebec402e7c7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LoopCond.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LoopCond.java
@@ -58,9 +58,8 @@ private LoopCond(Operation operation) {
       describeByClass = true
   )
   public static LoopCond create(Scope scope, Operand<TBool> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoopCond"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoopCond");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LoopCond(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LowerBound.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LowerBound.java
index 14f14ecb6a5..c85ad6e4d03 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LowerBound.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LowerBound.java
@@ -78,10 +78,9 @@ private LowerBound(Operation operation) {
   )
   public static <U extends TNumber, T extends TType> LowerBound<U> create(Scope scope,
       Operand<T> sortedInputs, Operand<T> values, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LowerBound"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LowerBound");
     opBuilder.addInput(sortedInputs.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new LowerBound<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MakeUnique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MakeUnique.java
index ad2274a2f8d..08c937e66d0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MakeUnique.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MakeUnique.java
@@ -60,9 +60,8 @@ private MakeUnique(Operation operation) {
       describeByClass = true
   )
   public static MakeUnique create(Scope scope, Operand<TFloat32> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MakeUnique"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MakeUnique");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MakeUnique(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapClear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapClear.java
index 0708a1f9515..3c5286f441e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapClear.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapClear.java
@@ -54,8 +54,7 @@ private MapClear(Operation operation) {
   )
   public static MapClear create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapClear"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapClear");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapDefun.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapDefun.java
index 60fb426abd6..79a32975feb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapDefun.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapDefun.java
@@ -85,10 +85,9 @@ private MapDefun(Operation operation) {
   public static MapDefun create(Scope scope, Iterable<Operand<?>> arguments,
       Iterable<Operand<?>> capturedInputs, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, ConcreteFunction f, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapDefun"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapDefun");
     opBuilder.addInputList(Operands.asOutputs(arguments));
     opBuilder.addInputList(Operands.asOutputs(capturedInputs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapIncompleteSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapIncompleteSize.java
index c6e0947f969..62bd05c0e04 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapIncompleteSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapIncompleteSize.java
@@ -61,8 +61,7 @@ private MapIncompleteSize(Operation operation) {
   )
   public static MapIncompleteSize create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapIncompleteSize"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapIncompleteSize");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapPeek.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapPeek.java
index 06f322f2b8c..c6adbd2b857 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapPeek.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapPeek.java
@@ -71,10 +71,9 @@ private MapPeek(Operation operation) {
   )
   public static MapPeek create(Scope scope, Operand<TInt64> key, Operand<TInt32> indices,
       List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapPeek"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapPeek");
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapSize.java
index d1f01833a66..ceadc2bef4e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapSize.java
@@ -61,8 +61,7 @@ private MapSize(Operation operation) {
   )
   public static MapSize create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapSize"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapSize");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapStage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapStage.java
index 3da1ee55f5c..574cd60547f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapStage.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapStage.java
@@ -61,11 +61,10 @@ private MapStage(Operation operation) {
   )
   public static MapStage create(Scope scope, Operand<TInt64> key, Operand<TInt32> indices,
       Iterable<Operand<?>> values, List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapStage"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapStage");
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInputList(Operands.asOutputs(values));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstage.java
index 9e5290c695d..2ef7744f042 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstage.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstage.java
@@ -71,10 +71,9 @@ private MapUnstage(Operation operation) {
   )
   public static MapUnstage create(Scope scope, Operand<TInt64> key, Operand<TInt32> indices,
       List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapUnstage"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapUnstage");
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstageNoKey.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstageNoKey.java
index 9d5dafbb305..81f4f6d9be4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstageNoKey.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstageNoKey.java
@@ -72,9 +72,8 @@ private MapUnstageNoKey(Operation operation) {
   )
   public static MapUnstageNoKey create(Scope scope, Operand<TInt32> indices,
       List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapUnstageNoKey"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapUnstageNoKey");
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java
index 8d56d0ff5fc..80021bab383 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java
@@ -67,10 +67,9 @@ private Max(Operation operation) {
   )
   public static <T extends TNumber> Max<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Max"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Max");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Merge.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Merge.java
index a6bc464d73c..1394ac32f14 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Merge.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Merge.java
@@ -68,9 +68,8 @@ private Merge(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Merge<T> create(Scope scope, Iterable<Operand<T>> inputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Merge"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Merge");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     return new Merge<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java
index 660cfc923e4..103d84eb153 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java
@@ -67,10 +67,9 @@ private Min(Operation operation) {
   )
   public static <T extends TNumber> Min<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Min"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Min");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java
index a8a74e51839..023d692cc37 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java
@@ -89,10 +89,9 @@ private MirrorPad(Operation operation) {
   )
   public static <T extends TType> MirrorPad<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> paddings, String mode) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MirrorPad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MirrorPad");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("mode", mode);
     return new MirrorPad<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java
index cb8ffb0e203..d3b94e606cf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java
@@ -76,10 +76,9 @@ private MirrorPadGrad(Operation operation) {
   )
   public static <T extends TType> MirrorPadGrad<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> paddings, String mode) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MirrorPadGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MirrorPadGrad");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("mode", mode);
     return new MirrorPadGrad<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MlirPassthroughOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MlirPassthroughOp.java
index fef5ae4f0e0..5640a48575d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MlirPassthroughOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MlirPassthroughOp.java
@@ -94,9 +94,8 @@ private MlirPassthroughOp(Operation operation) {
   )
   public static MlirPassthroughOp create(Scope scope, Iterable<Operand<?>> inputs,
       String mlirModule, List<Class<? extends TType>> Toutputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MlirPassthroughOp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MlirPassthroughOp");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("mlir_module", mlirModule);
     opBuilder.setAttr("Toutputs", Operands.toDataTypes(Toutputs));
     return new MlirPassthroughOp(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableDenseHashTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableDenseHashTable.java
index b1fae2e37ba..85c6d3e59bc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableDenseHashTable.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableDenseHashTable.java
@@ -71,10 +71,9 @@ private MutableDenseHashTable(Operation operation) {
   )
   public static <T extends TType, U extends TType> MutableDenseHashTable create(Scope scope,
       Operand<T> emptyKey, Operand<T> deletedKey, Class<U> valueDtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MutableDenseHashTable"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MutableDenseHashTable");
     opBuilder.addInput(emptyKey.asOutput());
     opBuilder.addInput(deletedKey.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTable.java
index 432aa2b40fc..c36a434d511 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTable.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTable.java
@@ -66,8 +66,7 @@ private MutableHashTable(Operation operation) {
   )
   public static <T extends TType, U extends TType> MutableHashTable create(Scope scope,
       Class<T> keyDtype, Class<U> valueDtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MutableHashTable"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MutableHashTable");
     opBuilder.setAttr("key_dtype", Operands.toDataType(keyDtype));
     opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTableOfTensors.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTableOfTensors.java
index ba82e946164..642d121f525 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTableOfTensors.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTableOfTensors.java
@@ -67,8 +67,7 @@ private MutableHashTableOfTensors(Operation operation) {
   )
   public static <T extends TType, U extends TType> MutableHashTableOfTensors create(Scope scope,
       Class<T> keyDtype, Class<U> valueDtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MutableHashTableOfTensors"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MutableHashTableOfTensors");
     opBuilder.setAttr("key_dtype", Operands.toDataType(keyDtype));
     opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Mutex.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Mutex.java
index 1082c127774..077d073461f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Mutex.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Mutex.java
@@ -57,8 +57,7 @@ private Mutex(Operation operation) {
       describeByClass = true
   )
   public static Mutex create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mutex"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Mutex");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutexLock.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutexLock.java
index dc24a517b7a..f455b008631 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutexLock.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutexLock.java
@@ -90,9 +90,8 @@ private MutexLock(Operation operation) {
       describeByClass = true
   )
   public static MutexLock create(Scope scope, Operand<? extends TType> mutex) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MutexLock"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MutexLock");
     opBuilder.addInput(mutex.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MutexLock(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclAllReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclAllReduce.java
index ac392938fdf..20f02704c1e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclAllReduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclAllReduce.java
@@ -74,9 +74,8 @@ private NcclAllReduce(Operation operation) {
   )
   public static <T extends TNumber> NcclAllReduce<T> create(Scope scope, Operand<T> input,
       String reduction, Long numDevices, String sharedName) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclAllReduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NcclAllReduce");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("reduction", reduction);
     opBuilder.setAttr("num_devices", numDevices);
     opBuilder.setAttr("shared_name", sharedName);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclBroadcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclBroadcast.java
index e7c25c28823..051928fcc27 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclBroadcast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclBroadcast.java
@@ -69,9 +69,8 @@ private NcclBroadcast(Operation operation) {
   )
   public static <T extends TNumber> NcclBroadcast<T> create(Scope scope, Operand<T> input,
       Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclBroadcast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NcclBroadcast");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("shape", shape);
     return new NcclBroadcast<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclReduce.java
index a17b786d775..41e9310df19 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclReduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclReduce.java
@@ -69,9 +69,8 @@ private NcclReduce(Operation operation) {
   )
   public static <T extends TNumber> NcclReduce<T> create(Scope scope, Iterable<Operand<T>> input,
       String reduction) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclReduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NcclReduce");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("reduction", reduction);
     return new NcclReduce<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NextIteration.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NextIteration.java
index 04da6e134c5..749b779b930 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NextIteration.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NextIteration.java
@@ -59,9 +59,8 @@ private NextIteration(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> NextIteration<T> create(Scope scope, Operand<T> data) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NextIteration"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NextIteration");
     opBuilder.addInput(data.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new NextIteration<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NoOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NoOp.java
index b5934d56a0d..1ac38903d0e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NoOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NoOp.java
@@ -48,8 +48,7 @@ private NoOp(Operation operation) {
       describeByClass = true
   )
   public static NoOp create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NoOp"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NoOp");
     return new NoOp(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java
index 5792ff7118d..ba0abba8433 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java
@@ -140,12 +140,11 @@ private OneHot(Operation operation) {
   )
   public static <U extends TType> OneHot<U> create(Scope scope, Operand<? extends TNumber> indices,
       Operand<TInt32> depth, Operand<U> onValue, Operand<U> offValue, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OneHot"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OneHot");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(depth.asOutput());
     opBuilder.addInput(onValue.asOutput());
     opBuilder.addInput(offValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.axis != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OnesLike.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OnesLike.java
index 45edcd7a34f..b2b7ca9aea1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OnesLike.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OnesLike.java
@@ -59,9 +59,8 @@ private OnesLike(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> OnesLike<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OnesLike"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OnesLike");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new OnesLike<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapClear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapClear.java
index eba41545c22..0802458e81a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapClear.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapClear.java
@@ -54,8 +54,7 @@ private OrderedMapClear(Operation operation) {
   )
   public static OrderedMapClear create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapClear"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OrderedMapClear");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapIncompleteSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapIncompleteSize.java
index c5d30ab0923..a57953ba304 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapIncompleteSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapIncompleteSize.java
@@ -61,8 +61,7 @@ private OrderedMapIncompleteSize(Operation operation) {
   )
   public static OrderedMapIncompleteSize create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapIncompleteSize"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OrderedMapIncompleteSize");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapPeek.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapPeek.java
index a6f8795b3cc..ae95103b6e6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapPeek.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapPeek.java
@@ -72,10 +72,9 @@ private OrderedMapPeek(Operation operation) {
   )
   public static OrderedMapPeek create(Scope scope, Operand<TInt64> key, Operand<TInt32> indices,
       List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapPeek"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OrderedMapPeek");
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapSize.java
index 41a0bad3554..4c84756d610 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapSize.java
@@ -61,8 +61,7 @@ private OrderedMapSize(Operation operation) {
   )
   public static OrderedMapSize create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapSize"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OrderedMapSize");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapStage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapStage.java
index a5b84ec8e64..760eb4ca9c2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapStage.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapStage.java
@@ -62,11 +62,10 @@ private OrderedMapStage(Operation operation) {
   )
   public static OrderedMapStage create(Scope scope, Operand<TInt64> key, Operand<TInt32> indices,
       Iterable<Operand<?>> values, List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapStage"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OrderedMapStage");
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInputList(Operands.asOutputs(values));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstage.java
index fcf11ce38bf..28b1341ab2d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstage.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstage.java
@@ -71,10 +71,9 @@ private OrderedMapUnstage(Operation operation) {
   )
   public static OrderedMapUnstage create(Scope scope, Operand<TInt64> key, Operand<TInt32> indices,
       List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapUnstage"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OrderedMapUnstage");
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstageNoKey.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstageNoKey.java
index 9656eaaa302..eb283576e4a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstageNoKey.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstageNoKey.java
@@ -72,9 +72,8 @@ private OrderedMapUnstageNoKey(Operation operation) {
   )
   public static OrderedMapUnstageNoKey create(Scope scope, Operand<TInt32> indices,
       List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapUnstageNoKey"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OrderedMapUnstageNoKey");
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java
index 5590bf808e8..4bcbc23ecaa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java
@@ -83,11 +83,10 @@ private Pad(Operation operation) {
   )
   public static <T extends TType> Pad<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> paddings, Operand<T> constantValues) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Pad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Pad");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
     opBuilder.addInput(constantValues.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Pad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelConcat.java
index 5ecabefbf81..e126523c99d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelConcat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelConcat.java
@@ -78,9 +78,8 @@ private ParallelConcat(Operation operation) {
   )
   public static <T extends TType> ParallelConcat<T> create(Scope scope, Iterable<Operand<T>> values,
       Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelConcat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParallelConcat");
     opBuilder.addInputList(Operands.asOutputs(values));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("shape", shape);
     return new ParallelConcat<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelDynamicStitch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelDynamicStitch.java
index 8ca88c679ab..3cf3afa61d6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelDynamicStitch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelDynamicStitch.java
@@ -115,10 +115,9 @@ private ParallelDynamicStitch(Operation operation) {
   )
   public static <T extends TType> ParallelDynamicStitch<T> create(Scope scope,
       Iterable<Operand<TInt32>> indices, Iterable<Operand<T>> data) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelDynamicStitch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParallelDynamicStitch");
     opBuilder.addInputList(Operands.asOutputs(indices));
     opBuilder.addInputList(Operands.asOutputs(data));
-    opBuilder = scope.apply(opBuilder);
     return new ParallelDynamicStitch<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Placeholder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Placeholder.java
index 084c7e60ca5..c8af0e07380 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Placeholder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Placeholder.java
@@ -66,8 +66,7 @@ private Placeholder(Operation operation) {
   )
   public static <T extends TType> Placeholder<T> create(Scope scope, Class<T> dtype,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Placeholder"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Placeholder");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/PlaceholderWithDefault.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/PlaceholderWithDefault.java
index 6c4f5ea8cf8..cbfefa3b7e0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/PlaceholderWithDefault.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/PlaceholderWithDefault.java
@@ -62,9 +62,8 @@ private PlaceholderWithDefault(Operation operation) {
   )
   public static <T extends TType> PlaceholderWithDefault<T> create(Scope scope, Operand<T> input,
       Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PlaceholderWithDefault"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PlaceholderWithDefault");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("shape", shape);
     return new PlaceholderWithDefault<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Print.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Print.java
index 7984706a37f..3b5a840baba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Print.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Print.java
@@ -53,9 +53,8 @@ private Print(Operation operation) {
       describeByClass = true
   )
   public static Print create(Scope scope, Operand<TString> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Print"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Print");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.outputStream != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java
index 3f9aadce98b..bdbc831c731 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java
@@ -68,10 +68,9 @@ private Prod(Operation operation) {
   )
   public static <T extends TType> Prod<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Prod"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Prod");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java
index 962d31d0c66..109794e32d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java
@@ -71,12 +71,11 @@ private QuantizedReshape(Operation operation) {
   )
   public static <T extends TType> QuantizedReshape<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> shape, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedReshape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedReshape");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new QuantizedReshape<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Range.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Range.java
index 9e957e384db..efa7b52d5de 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Range.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Range.java
@@ -71,11 +71,10 @@ private Range(Operation operation) {
   )
   public static <T extends TNumber> Range<T> create(Scope scope, Operand<T> start, Operand<T> limit,
       Operand<T> delta) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Range"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Range");
     opBuilder.addInput(start.asOutput());
     opBuilder.addInput(limit.asOutput());
     opBuilder.addInput(delta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Range<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java
index 1a1643d3a66..107dcf55c3c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java
@@ -67,9 +67,8 @@ private Rank(Operation operation) {
       describeByClass = true
   )
   public static Rank create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rank"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Rank");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Rank(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReadVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReadVariableOp.java
index 0839d68b8dc..574f737fbf5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReadVariableOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReadVariableOp.java
@@ -67,9 +67,8 @@ private ReadVariableOp(Operation operation) {
   )
   public static <T extends TType> ReadVariableOp<T> create(Scope scope,
       Operand<? extends TType> resource, Class<T> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReadVariableOp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReadVariableOp");
     opBuilder.addInput(resource.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new ReadVariableOp<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Recv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Recv.java
index 5c4792ea1f1..f149bf45dfd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Recv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Recv.java
@@ -65,8 +65,7 @@ private Recv(Operation operation) {
   public static <T extends TType> Recv<T> create(Scope scope, Class<T> tensorType,
       String tensorName, String sendDevice, Long sendDeviceIncarnation, String recvDevice,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Recv"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Recv");
     opBuilder.setAttr("tensor_type", Operands.toDataType(tensorType));
     opBuilder.setAttr("tensor_name", tensorName);
     opBuilder.setAttr("send_device", sendDevice);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java
index 93750a4f95a..2f6880725e2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java
@@ -65,10 +65,9 @@ private ReduceAll(Operation operation) {
   )
   public static ReduceAll create(Scope scope, Operand<TBool> input, Operand<? extends TNumber> axis,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceAll"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceAll");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java
index cf53d3a2071..268b0bdb9dd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java
@@ -65,10 +65,9 @@ private ReduceAny(Operation operation) {
   )
   public static ReduceAny create(Scope scope, Operand<TBool> input, Operand<? extends TNumber> axis,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceAny"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceAny");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java
index 66090f91d32..cae290b380e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java
@@ -67,10 +67,9 @@ private ReduceMax(Operation operation) {
   )
   public static <T extends TNumber> ReduceMax<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceMax");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java
index 91d1d46b9b0..34ea53c5ea2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java
@@ -67,10 +67,9 @@ private ReduceMin(Operation operation) {
   )
   public static <T extends TNumber> ReduceMin<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceMin");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java
index cde85542fe4..41fe7e66613 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java
@@ -68,10 +68,9 @@ private ReduceProd(Operation operation) {
   )
   public static <T extends TType> ReduceProd<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceProd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceProd");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java
index d39d5549be3..e41f01ec5e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java
@@ -68,10 +68,9 @@ private ReduceSum(Operation operation) {
   )
   public static <T extends TType> ReduceSum<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceSum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceSum");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefEnter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefEnter.java
index fcd9dbce973..f1da7e2da97 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefEnter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefEnter.java
@@ -64,9 +64,8 @@ private RefEnter(Operation operation) {
   )
   public static <T extends TType> RefEnter<T> create(Scope scope, Operand<T> data, String frameName,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefEnter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RefEnter");
     opBuilder.addInput(data.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("frame_name", frameName);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefExit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefExit.java
index 10f17674b87..126ed3227fd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefExit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefExit.java
@@ -58,9 +58,8 @@ private RefExit(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> RefExit<T> create(Scope scope, Operand<T> data) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefExit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RefExit");
     opBuilder.addInput(data.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RefExit<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefIdentity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefIdentity.java
index b5c66e12811..d96655bda8e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefIdentity.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefIdentity.java
@@ -57,9 +57,8 @@ private RefIdentity(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> RefIdentity<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefIdentity"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RefIdentity");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RefIdentity<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefMerge.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefMerge.java
index 6fb364c6d6f..85832cf8256 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefMerge.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefMerge.java
@@ -66,9 +66,8 @@ private RefMerge(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> RefMerge<T> create(Scope scope, Iterable<Operand<T>> inputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefMerge"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RefMerge");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     return new RefMerge<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefNextIteration.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefNextIteration.java
index 3276aa0be6b..b2759dd69c6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefNextIteration.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefNextIteration.java
@@ -59,9 +59,8 @@ private RefNextIteration(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> RefNextIteration<T> create(Scope scope, Operand<T> data) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefNextIteration"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RefNextIteration");
     opBuilder.addInput(data.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RefNextIteration<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSelect.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSelect.java
index 67bdc1e2644..dfa4056c286 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSelect.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSelect.java
@@ -63,10 +63,9 @@ private RefSelect(Operation operation) {
   )
   public static <T extends TType> RefSelect<T> create(Scope scope, Operand<TInt32> index,
       Iterable<Operand<T>> inputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefSelect"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RefSelect");
     opBuilder.addInput(index.asOutput());
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     return new RefSelect<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSwitch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSwitch.java
index 1ed139d0ae6..67cc4bfda6e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSwitch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSwitch.java
@@ -68,10 +68,9 @@ private RefSwitch(Operation operation) {
   )
   public static <T extends TType> RefSwitch<T> create(Scope scope, Operand<T> data,
       Operand<TBool> pred) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefSwitch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RefSwitch");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(pred.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RefSwitch<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RemoteCall.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RemoteCall.java
index 3848a6ff0e7..7d7b1288f0e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RemoteCall.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RemoteCall.java
@@ -69,10 +69,9 @@ private RemoteCall(Operation operation) {
   )
   public static RemoteCall create(Scope scope, Operand<TString> target, Iterable<Operand<?>> args,
       List<Class<? extends TType>> Tout, ConcreteFunction f) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RemoteCall"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RemoteCall");
     opBuilder.addInput(target.asOutput());
     opBuilder.addInputList(Operands.asOutputs(args));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     opBuilder.setAttr("f", f);
     return new RemoteCall(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java
index 9d2348c8426..7a3bc9a893d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java
@@ -116,10 +116,9 @@ private Reshape(Operation operation) {
   )
   public static <T extends TType> Reshape<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reshape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Reshape");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Reshape<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceCountUpTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceCountUpTo.java
index 7453e07c77e..34f0284ae4b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceCountUpTo.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceCountUpTo.java
@@ -65,9 +65,8 @@ private ResourceCountUpTo(Operation operation) {
   )
   public static <T extends TNumber> ResourceCountUpTo<T> create(Scope scope,
       Operand<? extends TType> resource, Long limit, Class<T> T) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceCountUpTo"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceCountUpTo");
     opBuilder.addInput(resource.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("limit", limit);
     opBuilder.setAttr("T", Operands.toDataType(T));
     return new ResourceCountUpTo<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java
index 683b025e2ac..fdaab3aec2c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java
@@ -78,10 +78,9 @@ private ResourceGather(Operation operation) {
   public static <U extends TType> ResourceGather<U> create(Scope scope,
       Operand<? extends TType> resource, Operand<? extends TNumber> indices, Class<U> dtype,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceGather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceGather");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java
index 679b7d18472..af2d44099ab 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java
@@ -64,10 +64,9 @@ private ResourceGatherNd(Operation operation) {
   )
   public static <U extends TType> ResourceGatherNd<U> create(Scope scope,
       Operand<? extends TType> resource, Operand<? extends TNumber> indices, Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceGatherNd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceGatherNd");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new ResourceGatherNd<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java
index 255192d11c7..aac3be02552 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java
@@ -72,11 +72,10 @@ private ResourceScatterAdd(Operation operation) {
   )
   public static ResourceScatterAdd create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterAdd");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceScatterAdd(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java
index b804e2dea4a..7b8f2a59f17 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java
@@ -72,11 +72,10 @@ private ResourceScatterDiv(Operation operation) {
   )
   public static ResourceScatterDiv create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterDiv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterDiv");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceScatterDiv(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java
index fe4b43b8d21..6ac4a9b54c5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java
@@ -72,11 +72,10 @@ private ResourceScatterMax(Operation operation) {
   )
   public static ResourceScatterMax create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterMax");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceScatterMax(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java
index 57c888412a4..d6564b259f5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java
@@ -72,11 +72,10 @@ private ResourceScatterMin(Operation operation) {
   )
   public static ResourceScatterMin create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterMin");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceScatterMin(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java
index 8bb5007d450..e684d3d59c3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java
@@ -72,11 +72,10 @@ private ResourceScatterMul(Operation operation) {
   )
   public static ResourceScatterMul create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterMul");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceScatterMul(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java
index b53c3fc4adb..2dbcbb99fb4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java
@@ -84,11 +84,10 @@ private ResourceScatterNdAdd(Operation operation) {
   )
   public static ResourceScatterNdAdd create(Scope scope, Operand<? extends TType> ref,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterNdAdd");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java
index d15a9286cba..e13320ecbbd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java
@@ -58,11 +58,10 @@ private ResourceScatterNdMax(Operation operation) {
   )
   public static ResourceScatterNdMax create(Scope scope, Operand<? extends TType> ref,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterNdMax");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java
index 1c5f45b9a18..4ae8c20a593 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java
@@ -58,11 +58,10 @@ private ResourceScatterNdMin(Operation operation) {
   )
   public static ResourceScatterNdMin create(Scope scope, Operand<? extends TType> ref,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterNdMin");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java
index c7ee744bc80..efb90c87f24 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java
@@ -84,11 +84,10 @@ private ResourceScatterNdSub(Operation operation) {
   )
   public static ResourceScatterNdSub create(Scope scope, Operand<? extends TType> ref,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdSub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterNdSub");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java
index 036b760d68f..14d91f6efcf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java
@@ -85,11 +85,10 @@ private ResourceScatterNdUpdate(Operation operation) {
   )
   public static ResourceScatterNdUpdate create(Scope scope, Operand<? extends TType> ref,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdUpdate"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterNdUpdate");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java
index f747d5d01a0..671bad91fea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java
@@ -72,11 +72,10 @@ private ResourceScatterSub(Operation operation) {
   )
   public static ResourceScatterSub create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterSub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterSub");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceScatterSub(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java
index 46c6911cb82..29267287d92 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java
@@ -66,11 +66,10 @@ private ResourceScatterUpdate(Operation operation) {
   )
   public static ResourceScatterUpdate create(Scope scope, Operand<? extends TType> resource,
       Operand<? extends TNumber> indices, Operand<? extends TType> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterUpdate"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceScatterUpdate");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceScatterUpdate(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java
index 8b7842cd447..955b0ada1c7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java
@@ -65,13 +65,12 @@ private ResourceStridedSliceAssign(Operation operation) {
   public static <T extends TNumber> ResourceStridedSliceAssign create(Scope scope,
       Operand<? extends TType> ref, Operand<T> begin, Operand<T> end, Operand<T> strides,
       Operand<? extends TType> value, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceStridedSliceAssign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceStridedSliceAssign");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(begin.asOutput());
     opBuilder.addInput(end.asOutput());
     opBuilder.addInput(strides.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.beginMask != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java
index 5b40a326bf0..837592b303e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java
@@ -105,10 +105,9 @@ private Reverse(Operation operation) {
   )
   public static <T extends TType> Reverse<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> axis) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reverse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Reverse");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Reverse<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java
index e28d178d8f3..daf11cec5d7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java
@@ -113,10 +113,9 @@ private ReverseSequence(Operation operation) {
   )
   public static <T extends TType> ReverseSequence<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> seqLengths, Long seqDim, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReverseSequence"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReverseSequence");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(seqLengths.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("seq_dim", seqDim);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java
index f278c3544e5..aac1ac5b97c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java
@@ -87,11 +87,10 @@ private Roll(Operation operation) {
   )
   public static <T extends TType> Roll<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> shift, Operand<? extends TNumber> axis) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Roll"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Roll");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(shift.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Roll<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java
index 0f5b6446f10..c81635554e4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java
@@ -83,11 +83,10 @@ private ScatterAdd(Operation operation) {
   )
   public static <T extends TType> ScatterAdd<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterAdd");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java
index a4ce6cb7081..4b10a83e82e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java
@@ -80,11 +80,10 @@ private ScatterDiv(Operation operation) {
   )
   public static <T extends TType> ScatterDiv<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterDiv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterDiv");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java
index d2c7d88e595..78e7a0941e2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java
@@ -82,11 +82,10 @@ private ScatterMax(Operation operation) {
   )
   public static <T extends TNumber> ScatterMax<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterMax");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java
index 573c22dd90b..3123ee56351 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java
@@ -82,11 +82,10 @@ private ScatterMin(Operation operation) {
   )
   public static <T extends TNumber> ScatterMin<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterMin");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java
index db7eb4911aa..69b0b2d4f0a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java
@@ -80,11 +80,10 @@ private ScatterMul(Operation operation) {
   )
   public static <T extends TType> ScatterMul<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterMul");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNd.java
index f56f759952b..9527ab8a9d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNd.java
@@ -132,11 +132,10 @@ private ScatterNd(Operation operation) {
   )
   public static <U extends TType, T extends TNumber> ScatterNd<U> create(Scope scope,
       Operand<T> indices, Operand<U> updates, Operand<T> shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterNd");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ScatterNd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java
index dffda533284..0637e6e539f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java
@@ -92,11 +92,10 @@ private ScatterNdAdd(Operation operation) {
   )
   public static <T extends TType> ScatterNdAdd<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterNdAdd");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java
index 09ee60144cc..c518f023126 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java
@@ -64,11 +64,10 @@ private ScatterNdMax(Operation operation) {
   )
   public static <T extends TType> ScatterNdMax<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterNdMax");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java
index 149b18ce7d8..e273fac503d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java
@@ -64,11 +64,10 @@ private ScatterNdMin(Operation operation) {
   )
   public static <T extends TType> ScatterNdMin<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterNdMin");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java
index 5e1c718bd6a..585cfaae92e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java
@@ -92,11 +92,10 @@ private ScatterNdNonAliasingAdd(Operation operation) {
   )
   public static <T extends TType> ScatterNdNonAliasingAdd<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> indices, Operand<T> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdNonAliasingAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterNdNonAliasingAdd");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ScatterNdNonAliasingAdd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java
index cd5edc87ba1..ee2cff02224 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java
@@ -93,11 +93,10 @@ private ScatterNdSub(Operation operation) {
   )
   public static <T extends TType> ScatterNdSub<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdSub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterNdSub");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java
index b40a4240311..ba0b795aa83 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java
@@ -92,11 +92,10 @@ private ScatterNdUpdate(Operation operation) {
   )
   public static <T extends TType> ScatterNdUpdate<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdUpdate"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterNdUpdate");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java
index af59a6d916c..cae017a50ac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java
@@ -82,11 +82,10 @@ private ScatterSub(Operation operation) {
   )
   public static <T extends TType> ScatterSub<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterSub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterSub");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java
index 0ab648a0619..4bd3154363b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java
@@ -85,11 +85,10 @@ private ScatterUpdate(Operation operation) {
   )
   public static <T extends TType> ScatterUpdate<T> create(Scope scope, Operand<T> ref,
       Operand<? extends TNumber> indices, Operand<T> updates, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterUpdate"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScatterUpdate");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Select.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Select.java
index 51697076712..440d414329a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Select.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Select.java
@@ -63,11 +63,10 @@ private Select(Operation operation) {
   )
   public static <T extends TType> Select<T> create(Scope scope, Operand<TBool> condition,
       Operand<T> t, Operand<T> e) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Select"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Select");
     opBuilder.addInput(condition.asOutput());
     opBuilder.addInput(t.asOutput());
     opBuilder.addInput(e.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Select<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java
index 6898ac5d212..5109bd3822b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java
@@ -55,9 +55,8 @@ private Send(Operation operation) {
   )
   public static Send create(Scope scope, Operand<? extends TType> tensor, String tensorName,
       String sendDevice, Long sendDeviceIncarnation, String recvDevice, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Send"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Send");
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("tensor_name", tensorName);
     opBuilder.setAttr("send_device", sendDevice);
     opBuilder.setAttr("send_device_incarnation", sendDeviceIncarnation);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetDiff1d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetDiff1d.java
index e5279c5d733..97a1e34ec7c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetDiff1d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetDiff1d.java
@@ -87,10 +87,9 @@ private SetDiff1d(Operation operation) {
   )
   public static <T extends TType, U extends TNumber> SetDiff1d<T, U> create(Scope scope,
       Operand<T> x, Operand<T> y, Class<U> outIdx) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetDiff1d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SetDiff1d");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_idx", Operands.toDataType(outIdx));
     return new SetDiff1d<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java
index 28bc5ffaf95..c604a916ab0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java
@@ -67,11 +67,10 @@ private SetSize(Operation operation) {
   )
   public static SetSize create(Scope scope, Operand<TInt64> setIndices,
       Operand<? extends TType> setValues, Operand<TInt64> setShape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetSize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SetSize");
     opBuilder.addInput(setIndices.asOutput());
     opBuilder.addInput(setValues.asOutput());
     opBuilder.addInput(setShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.validateIndices != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java
index 90b5b640701..64a2b0a20b4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java
@@ -70,9 +70,8 @@ private Shape(Operation operation) {
   )
   public static <U extends TNumber> Shape<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Shape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Shape");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new Shape<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ShapeN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ShapeN.java
index ec88a0524eb..7b253f50380 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ShapeN.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ShapeN.java
@@ -71,9 +71,8 @@ private ShapeN(Operation operation) {
   )
   public static <U extends TNumber> ShapeN<U> create(Scope scope,
       Iterable<Operand<? extends TType>> input, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShapeN"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ShapeN");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new ShapeN<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java
index 843ef45b612..0f53c9b0d96 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java
@@ -71,9 +71,8 @@ private Size(Operation operation) {
   )
   public static <U extends TNumber> Size<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Size"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Size");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new Size<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Skipgram.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Skipgram.java
index 9798383eac7..f456a2cfe18 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Skipgram.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Skipgram.java
@@ -77,8 +77,7 @@ private Skipgram(Operation operation) {
       describeByClass = true
   )
   public static Skipgram create(Scope scope, String filename, Long batchSize, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Skipgram"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Skipgram");
     opBuilder.setAttr("filename", filename);
     opBuilder.setAttr("batch_size", batchSize);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Slice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Slice.java
index 7e3167430b7..0a746d7218c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Slice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Slice.java
@@ -73,11 +73,10 @@ private Slice(Operation operation) {
   )
   public static <T extends TType, U extends TNumber> Slice<T> create(Scope scope, Operand<T> input,
       Operand<U> begin, Operand<U> sizeOutput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Slice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Slice");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(begin.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Slice<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Snapshot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Snapshot.java
index bf7c137713d..c4c48291adb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Snapshot.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Snapshot.java
@@ -59,9 +59,8 @@ private Snapshot(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Snapshot<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Snapshot"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Snapshot");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Snapshot<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java
index 3e2058a0f29..16509bc4a85 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java
@@ -36,8 +36,96 @@
  * {@code [1, ..., M]} correspond to the position within the grid, and the batch
  * dimension combines both the position within a spatial block and the original
  * batch position.  Prior to division into blocks, the spatial dimensions of the
- * input are optionally zero padded according to {@code paddings}.  See below for a
+ * input are optionally zero padded according to {@code paddings}. See below for a
  * precise description.
+ * <p>This operation is equivalent to the following steps:
+ * <ol>
+ * <li>
+ * <p>Zero-pad the start and end of dimensions {@code [1, ..., M]} of the
+ * input according to {@code paddings} to produce {@code padded} of shape {@code padded_shape}.
+ * </li>
+ * <li>
+ * <p>Reshape {@code padded} to {@code reshaped_padded} of shape:
+ * <p>[batch] +
+ * [padded_shape[1] / block_shape[0],
+ * block_shape[0],
+ * ...,
+ * padded_shape[M] / block_shape[M-1],
+ * block_shape[M-1]] +
+ * remaining_shape
+ * </li>
+ * <li>
+ * <p>Permute dimensions of {@code reshaped_padded} to produce
+ * {@code permuted_reshaped_padded} of shape:
+ * <p>block_shape +
+ * [batch] +
+ * [padded_shape[1] / block_shape[0],
+ * ...,
+ * padded_shape[M] / block_shape[M-1]] +
+ * remaining_shape
+ * </li>
+ * <li>
+ * <p>Reshape {@code permuted_reshaped_padded} to flatten {@code block_shape} into the batch
+ * dimension, producing an output tensor of shape:
+ * <p>[batch * prod(block_shape)] +
+ * [padded_shape[1] / block_shape[0],
+ * ...,
+ * padded_shape[M] / block_shape[M-1]] +
+ * remaining_shape
+ * </li>
+ * </ol>
+ * <p>Some examples:
+ * <p>(1) For the following input of shape {@code [1, 2, 2, 1]}, {@code block_shape = [2, 2]}, and
+ * {@code paddings = [[0, 0], [0, 0]]}:
+ * <pre>
+ * x = [[[[1], [2]], [[3], [4]]]]
+ * </pre>
+ * <p>The output tensor has shape {@code [4, 1, 1, 1]} and value:
+ * <pre>
+ * [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
+ * </pre>
+ * <p>(2) For the following input of shape {@code [1, 2, 2, 3]}, {@code block_shape = [2, 2]}, and
+ * {@code paddings = [[0, 0], [0, 0]]}:
+ * <pre>
+ * x = [[[[1, 2, 3], [4, 5, 6]],
+ *       [[7, 8, 9], [10, 11, 12]]]]
+ * </pre>
+ * <p>The output tensor has shape {@code [4, 1, 1, 3]} and value:
+ * <pre>
+ * [[[[1, 2, 3]]], [[[4, 5, 6]]], [[[7, 8, 9]]], [[[10, 11, 12]]]]
+ * </pre>
+ * <p>(3) For the following input of shape {@code [1, 4, 4, 1]}, {@code block_shape = [2, 2]}, and
+ * {@code paddings = [[0, 0], [0, 0]]}:
+ * <pre>
+ * x = [[[[1],   [2],  [3],  [4]],
+ *       [[5],   [6],  [7],  [8]],
+ *       [[9],  [10], [11],  [12]],
+ *       [[13], [14], [15],  [16]]]]
+ * </pre>
+ * <p>The output tensor has shape {@code [4, 2, 2, 1]} and value:
+ * <pre>
+ * x = [[[[1], [3]], [[9], [11]]],
+ *      [[[2], [4]], [[10], [12]]],
+ *      [[[5], [7]], [[13], [15]]],
+ *      [[[6], [8]], [[14], [16]]]]
+ * </pre>
+ * <p>(4) For the following input of shape {@code [2, 2, 4, 1]}, block_shape = {@code [2, 2]}, and
+ * paddings = {@code [[0, 0], [2, 0]]}:
+ * <pre>
+ * x = [[[[1],   [2],  [3],  [4]],
+ *       [[5],   [6],  [7],  [8]]],
+ *      [[[9],  [10], [11],  [12]],
+ *       [[13], [14], [15],  [16]]]]
+ * </pre>
+ * <p>The output tensor has shape {@code [8, 1, 3, 1]} and value:
+ * <pre>
+ * x = [[[[0], [1], [3]]], [[[0], [9], [11]]],
+ *      [[[0], [2], [4]]], [[[0], [10], [12]]],
+ *      [[[0], [5], [7]]], [[[0], [13], [15]]],
+ *      [[[0], [6], [8]]], [[[0], [14], [16]]]]
+ * </pre>
+ * <p>Among others, this operation is useful for reducing atrous convolution into
+ * regular convolution.
  *
  * @param <T> data type for {@code output} output
  */
@@ -67,94 +155,6 @@ private SpaceToBatchNd(Operation operation) {
    * {@code paddings[i] = [pad_start, pad_end]} specifies the padding for input dimension
    * {@code i + 1}, which corresponds to spatial dimension {@code i}.  It is required that
    * {@code block_shape[i]} divides {@code input_shape[i + 1] + pad_start + pad_end}.
-   * <p>This operation is equivalent to the following steps:
-   * <ol>
-   * <li>
-   * <p>Zero-pad the start and end of dimensions {@code [1, ..., M]} of the
-   * input according to {@code paddings} to produce {@code padded} of shape {@code padded_shape}.
-   * </li>
-   * <li>
-   * <p>Reshape {@code padded} to {@code reshaped_padded} of shape:
-   * <p>[batch] +
-   * [padded_shape[1] / block_shape[0],
-   * block_shape[0],
-   * ...,
-   * padded_shape[M] / block_shape[M-1],
-   * block_shape[M-1]] +
-   * remaining_shape
-   * </li>
-   * <li>
-   * <p>Permute dimensions of {@code reshaped_padded} to produce
-   * {@code permuted_reshaped_padded} of shape:
-   * <p>block_shape +
-   * [batch] +
-   * [padded_shape[1] / block_shape[0],
-   * ...,
-   * padded_shape[M] / block_shape[M-1]] +
-   * remaining_shape
-   * </li>
-   * <li>
-   * <p>Reshape {@code permuted_reshaped_padded} to flatten {@code block_shape} into the batch
-   * dimension, producing an output tensor of shape:
-   * <p>[batch * prod(block_shape)] +
-   * [padded_shape[1] / block_shape[0],
-   * ...,
-   * padded_shape[M] / block_shape[M-1]] +
-   * remaining_shape
-   * </li>
-   * </ol>
-   * <p>Some examples:
-   * <p>(1) For the following input of shape {@code [1, 2, 2, 1]}, {@code block_shape = [2, 2]}, and
-   * {@code paddings = [[0, 0], [0, 0]]}:
-   * <pre>
-   * x = [[[[1], [2]], [[3], [4]]]]
-   * </pre>
-   * <p>The output tensor has shape {@code [4, 1, 1, 1]} and value:
-   * <pre>
-   * [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
-   * </pre>
-   * <p>(2) For the following input of shape {@code [1, 2, 2, 3]}, {@code block_shape = [2, 2]}, and
-   * {@code paddings = [[0, 0], [0, 0]]}:
-   * <pre>
-   * x = [[[[1, 2, 3], [4, 5, 6]],
-   *       [[7, 8, 9], [10, 11, 12]]]]
-   * </pre>
-   * <p>The output tensor has shape {@code [4, 1, 1, 3]} and value:
-   * <pre>
-   * [[[[1, 2, 3]]], [[[4, 5, 6]]], [[[7, 8, 9]]], [[[10, 11, 12]]]]
-   * </pre>
-   * <p>(3) For the following input of shape {@code [1, 4, 4, 1]}, {@code block_shape = [2, 2]}, and
-   * {@code paddings = [[0, 0], [0, 0]]}:
-   * <pre>
-   * x = [[[[1],   [2],  [3],  [4]],
-   *       [[5],   [6],  [7],  [8]],
-   *       [[9],  [10], [11],  [12]],
-   *       [[13], [14], [15],  [16]]]]
-   * </pre>
-   * <p>The output tensor has shape {@code [4, 2, 2, 1]} and value:
-   * <pre>
-   * x = [[[[1], [3]], [[9], [11]]],
-   *      [[[2], [4]], [[10], [12]]],
-   *      [[[5], [7]], [[13], [15]]],
-   *      [[[6], [8]], [[14], [16]]]]
-   * </pre>
-   * <p>(4) For the following input of shape {@code [2, 2, 4, 1]}, block_shape = {@code [2, 2]}, and
-   * paddings = {@code [[0, 0], [2, 0]]}:
-   * <pre>
-   * x = [[[[1],   [2],  [3],  [4]],
-   *       [[5],   [6],  [7],  [8]]],
-   *      [[[9],  [10], [11],  [12]],
-   *       [[13], [14], [15],  [16]]]]
-   * </pre>
-   * <p>The output tensor has shape {@code [8, 1, 3, 1]} and value:
-   * <pre>
-   * x = [[[[0], [1], [3]]], [[[0], [9], [11]]],
-   *      [[[0], [2], [4]]], [[[0], [10], [12]]],
-   *      [[[0], [5], [7]]], [[[0], [13], [15]]],
-   *      [[[0], [6], [8]]], [[[0], [14], [16]]]]
-   * </pre>
-   * <p>Among others, this operation is useful for reducing atrous convolution into
-   * regular convolution.
    * @param <T> data type for {@code SpaceToBatchND} output and operands
    * @return a new instance of SpaceToBatchNd
    */
@@ -163,11 +163,10 @@ private SpaceToBatchNd(Operation operation) {
   )
   public static <T extends TType> SpaceToBatchNd<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> blockShape, Operand<? extends TNumber> paddings) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SpaceToBatchNd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SpaceToBatchNd");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(blockShape.asOutput());
     opBuilder.addInput(paddings.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SpaceToBatchNd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Split.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Split.java
index 4162d54ea94..a6427f4b6e6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Split.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Split.java
@@ -71,10 +71,9 @@ private Split(Operation operation) {
   )
   public static <T extends TType> Split<T> create(Scope scope, Operand<TInt32> axis,
       Operand<T> value, Long numSplit) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Split"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Split");
     opBuilder.addInput(axis.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_split", numSplit);
     return new Split<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java
index 78a4d9eeab4..6bec947b699 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java
@@ -74,11 +74,10 @@ private SplitV(Operation operation) {
   )
   public static <T extends TType> SplitV<T> create(Scope scope, Operand<T> value,
       Operand<? extends TNumber> sizeSplits, Operand<TInt32> axis, Long numSplit) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SplitV"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SplitV");
     opBuilder.addInput(value.asOutput());
     opBuilder.addInput(sizeSplits.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_split", numSplit);
     return new SplitV<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Squeeze.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Squeeze.java
index 21b26dccd20..a835bd6a74b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Squeeze.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Squeeze.java
@@ -77,9 +77,8 @@ private Squeeze(Operation operation) {
   )
   public static <T extends TType> Squeeze<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Squeeze"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Squeeze");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.axis != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stack.java
index 6e5b987d0bd..7c8e0e5a906 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stack.java
@@ -77,9 +77,8 @@ private Stack(Operation operation) {
   )
   public static <T extends TType> Stack<T> create(Scope scope, Iterable<Operand<T>> values,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Stack"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Stack");
     opBuilder.addInputList(Operands.asOutputs(values));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.axis != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stage.java
index ce4d35c9563..3256cf414d0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stage.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stage.java
@@ -55,9 +55,8 @@ private Stage(Operation operation) {
       describeByClass = true
   )
   public static Stage create(Scope scope, Iterable<Operand<?>> values, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Stage"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Stage");
     opBuilder.addInputList(Operands.asOutputs(values));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.capacity != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageClear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageClear.java
index 76a4c785f31..5b0783a7749 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageClear.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageClear.java
@@ -54,8 +54,7 @@ private StageClear(Operation operation) {
   )
   public static StageClear create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StageClear"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StageClear");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StagePeek.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StagePeek.java
index dce04d53f5b..aec3b040f83 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StagePeek.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StagePeek.java
@@ -70,9 +70,8 @@ private StagePeek(Operation operation) {
   )
   public static StagePeek create(Scope scope, Operand<TInt32> index,
       List<Class<? extends TType>> dtypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StagePeek"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StagePeek");
     opBuilder.addInput(index.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageSize.java
index 107d54d890e..e850b1ef705 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageSize.java
@@ -61,8 +61,7 @@ private StageSize(Operation operation) {
   )
   public static StageSize create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StageSize"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StageSize");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulCase.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulCase.java
index 817539cb187..33592086451 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulCase.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulCase.java
@@ -93,10 +93,9 @@ private StatefulCase(Operation operation) {
   public static StatefulCase create(Scope scope, Operand<TInt32> branchIndex,
       Iterable<Operand<?>> input, List<Class<? extends TType>> Tout,
       List<ConcreteFunction> branches, Case.Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulCase"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulCase");
     opBuilder.addInput(branchIndex.asOutput());
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     ConcreteFunction[] branchesArray = new ConcreteFunction[branches.size()];
     for (int i = 0 ; i < branchesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulIf.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulIf.java
index e1f13750f3e..9aa0ff99791 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulIf.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulIf.java
@@ -85,10 +85,9 @@ private StatefulIf(Operation operation) {
   public static StatefulIf create(Scope scope, Operand<? extends TType> cond,
       Iterable<Operand<?>> input, List<Class<? extends TType>> Tout, ConcreteFunction thenBranch,
       ConcreteFunction elseBranch, If.Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulIf"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulIf");
     opBuilder.addInput(cond.asOutput());
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     opBuilder.setAttr("then_branch", thenBranch);
     opBuilder.setAttr("else_branch", elseBranch);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulPartitionedCall.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulPartitionedCall.java
index ce789a235f9..465930a4057 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulPartitionedCall.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulPartitionedCall.java
@@ -74,9 +74,8 @@ private StatefulPartitionedCall(Operation operation) {
   )
   public static StatefulPartitionedCall create(Scope scope, Iterable<Operand<?>> args,
       List<Class<? extends TType>> Tout, ConcreteFunction f, PartitionedCall.Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulPartitionedCall"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulPartitionedCall");
     opBuilder.addInputList(Operands.asOutputs(args));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     opBuilder.setAttr("f", f);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulWhile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulWhile.java
index 5d8fdcff241..4ea25bdd005 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulWhile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatefulWhile.java
@@ -81,9 +81,8 @@ private StatefulWhile(Operation operation) {
   )
   public static StatefulWhile create(Scope scope, Iterable<Operand<?>> input, ConcreteFunction cond,
       ConcreteFunction body, While.Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulWhile"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulWhile");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("cond", cond);
     opBuilder.setAttr("body", body);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessCase.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessCase.java
index 31326021300..2241b1c8c5f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessCase.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessCase.java
@@ -93,10 +93,9 @@ private StatelessCase(Operation operation) {
   public static StatelessCase create(Scope scope, Operand<TInt32> branchIndex,
       Iterable<Operand<?>> input, List<Class<? extends TType>> Tout,
       List<ConcreteFunction> branches, Case.Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessCase"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessCase");
     opBuilder.addInput(branchIndex.asOutput());
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     ConcreteFunction[] branchesArray = new ConcreteFunction[branches.size()];
     for (int i = 0 ; i < branchesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessIf.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessIf.java
index 83589e73a34..820c287e503 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessIf.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessIf.java
@@ -88,10 +88,9 @@ private StatelessIf(Operation operation) {
   public static StatelessIf create(Scope scope, Operand<? extends TType> cond,
       Iterable<Operand<?>> input, List<Class<? extends TType>> Tout, ConcreteFunction thenBranch,
       ConcreteFunction elseBranch, If.Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessIf"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessIf");
     opBuilder.addInput(cond.asOutput());
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     opBuilder.setAttr("then_branch", thenBranch);
     opBuilder.setAttr("else_branch", elseBranch);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessPartitionedCall.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessPartitionedCall.java
index f497454692b..1563fa781d6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessPartitionedCall.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessPartitionedCall.java
@@ -34,6 +34,9 @@
 
 /**
  * returns {@code f(inputs)}, where {@code f}'s body is placed and partitioned.
+ * Asynchronously executes a function, potentially across multiple devices but
+ * within a single process. The kernel places and partitions a given function's
+ * underlying graph, and executes each of the partitioned subgraphs as a function.
  */
 @Operator
 public final class StatelessPartitionedCall extends RawOp implements PartitionedCall {
@@ -73,9 +76,8 @@ private StatelessPartitionedCall(Operation operation) {
   )
   public static StatelessPartitionedCall create(Scope scope, Iterable<Operand<?>> args,
       List<Class<? extends TType>> Tout, ConcreteFunction f, PartitionedCall.Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessPartitionedCall"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessPartitionedCall");
     opBuilder.addInputList(Operands.asOutputs(args));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     opBuilder.setAttr("f", f);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessWhile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessWhile.java
index 77c067dfa42..94fc05214d6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessWhile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StatelessWhile.java
@@ -84,9 +84,8 @@ private StatelessWhile(Operation operation) {
   )
   public static StatelessWhile create(Scope scope, Iterable<Operand<?>> input,
       ConcreteFunction cond, ConcreteFunction body, While.Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessWhile"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessWhile");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("cond", cond);
     opBuilder.setAttr("body", body);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StopGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StopGradient.java
index ca4fc6a1bf0..045f9f840ec 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StopGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StopGradient.java
@@ -109,9 +109,8 @@ private StopGradient(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> StopGradient<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StopGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StopGradient");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StopGradient<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSlice.java
index 7edb1753b86..60be840fc96 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSlice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSlice.java
@@ -172,12 +172,11 @@ private StridedSlice(Operation operation) {
   )
   public static <T extends TType, U extends TNumber> StridedSlice<T> create(Scope scope,
       Operand<T> input, Operand<U> begin, Operand<U> end, Operand<U> strides, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StridedSlice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StridedSlice");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(begin.asOutput());
     opBuilder.addInput(end.asOutput());
     opBuilder.addInput(strides.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.beginMask != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceAssign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceAssign.java
index c866bc5bd86..dc64084c4d5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceAssign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceAssign.java
@@ -73,13 +73,12 @@ private StridedSliceAssign(Operation operation) {
   public static <T extends TType, U extends TNumber> StridedSliceAssign<T> create(Scope scope,
       Operand<T> ref, Operand<U> begin, Operand<U> end, Operand<U> strides, Operand<T> value,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StridedSliceAssign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StridedSliceAssign");
     opBuilder.addInput(ref.asOutput());
     opBuilder.addInput(begin.asOutput());
     opBuilder.addInput(end.asOutput());
     opBuilder.addInput(strides.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.beginMask != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceGrad.java
index 1ad183e57b1..123691b24c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceGrad.java
@@ -75,13 +75,12 @@ private StridedSliceGrad(Operation operation) {
   public static <U extends TType, T extends TNumber> StridedSliceGrad<U> create(Scope scope,
       Operand<T> shape, Operand<T> begin, Operand<T> end, Operand<T> strides, Operand<U> dy,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StridedSliceGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StridedSliceGrad");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(begin.asOutput());
     opBuilder.addInput(end.asOutput());
     opBuilder.addInput(strides.asOutput());
     opBuilder.addInput(dy.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.beginMask != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java
index 99da35103ef..ec0dfd9f6e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java
@@ -68,10 +68,9 @@ private Sum(Operation operation) {
   )
   public static <T extends TType> Sum<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sum");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SwitchCond.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SwitchCond.java
index 10c505712cb..a65d91c3038 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SwitchCond.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SwitchCond.java
@@ -68,10 +68,9 @@ private SwitchCond(Operation operation) {
   )
   public static <T extends TType> SwitchCond<T> create(Scope scope, Operand<T> data,
       Operand<TBool> pred) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SwitchCond"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SwitchCond");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(pred.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SwitchCond<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TemporaryVariable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TemporaryVariable.java
index 831d802c12b..93baf455fa5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TemporaryVariable.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TemporaryVariable.java
@@ -75,8 +75,7 @@ private TemporaryVariable(Operation operation) {
   )
   public static <T extends TType> TemporaryVariable<T> create(Scope scope, Shape shape,
       Class<T> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TemporaryVariable"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TemporaryVariable");
     opBuilder.setAttr("shape", shape);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArray.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArray.java
index b8b5569c61f..39979757083 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArray.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArray.java
@@ -69,9 +69,8 @@ private TensorArray(Operation operation) {
   )
   public static <T extends TType> TensorArray create(Scope scope, Operand<TInt32> sizeOutput,
       Class<T> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArray"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArray");
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayClose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayClose.java
index fee13859bc3..37ac21f17af 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayClose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayClose.java
@@ -53,9 +53,8 @@ private TensorArrayClose(Operation operation) {
       describeByClass = true
   )
   public static TensorArrayClose create(Scope scope, Operand<? extends TType> handle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayClose"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayClose");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorArrayClose(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayConcat.java
index cff4355cd2b..6c4cb0582ff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayConcat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayConcat.java
@@ -78,10 +78,9 @@ private TensorArrayConcat(Operation operation) {
   public static <T extends TType> TensorArrayConcat<T> create(Scope scope,
       Operand<? extends TType> handle, Operand<TFloat32> flowIn, Class<T> dtype,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayConcat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayConcat");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGather.java
index a4e2e66c65d..9560693fd21 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGather.java
@@ -70,11 +70,10 @@ private TensorArrayGather(Operation operation) {
   public static <T extends TType> TensorArrayGather<T> create(Scope scope,
       Operand<? extends TType> handle, Operand<TInt32> indices, Operand<TFloat32> flowIn,
       Class<T> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayGather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayGather");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGrad.java
index a3c1b3922bb..0047982655f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGrad.java
@@ -93,10 +93,9 @@ private TensorArrayGrad(Operation operation) {
   )
   public static TensorArrayGrad create(Scope scope, Operand<? extends TType> handle,
       Operand<TFloat32> flowIn, String source) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayGrad");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("source", source);
     return new TensorArrayGrad(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGradWithShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGradWithShape.java
index 284787874da..c4da5d01248 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGradWithShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGradWithShape.java
@@ -73,11 +73,10 @@ private TensorArrayGradWithShape(Operation operation) {
   )
   public static TensorArrayGradWithShape create(Scope scope, Operand<? extends TType> handle,
       Operand<TFloat32> flowIn, Operand<TInt32> shapeToPrepend, String source) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayGradWithShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayGradWithShape");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(flowIn.asOutput());
     opBuilder.addInput(shapeToPrepend.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("source", source);
     return new TensorArrayGradWithShape(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayPack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayPack.java
index fd714faff19..f51f2f30a17 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayPack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayPack.java
@@ -67,10 +67,9 @@ private TensorArrayPack(Operation operation) {
   )
   public static <T extends TType> TensorArrayPack<T> create(Scope scope, Operand<TString> handle,
       Operand<TFloat32> flowIn, Class<T> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayPack"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayPack");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayRead.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayRead.java
index bc532f9dfba..a7f254c8395 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayRead.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayRead.java
@@ -67,11 +67,10 @@ private TensorArrayRead(Operation operation) {
   public static <T extends TType> TensorArrayRead<T> create(Scope scope,
       Operand<? extends TType> handle, Operand<TInt32> index, Operand<TFloat32> flowIn,
       Class<T> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayRead"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayRead");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(index.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new TensorArrayRead<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java
index 2f0fb588481..2fd32332990 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java
@@ -63,12 +63,11 @@ private TensorArrayScatter(Operation operation) {
   )
   public static TensorArrayScatter create(Scope scope, Operand<? extends TType> handle,
       Operand<TInt32> indices, Operand<? extends TType> value, Operand<TFloat32> flowIn) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayScatter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayScatter");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(value.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorArrayScatter(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySize.java
index 45eabcee0d5..b1c0847805e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySize.java
@@ -60,10 +60,9 @@ private TensorArraySize(Operation operation) {
   )
   public static TensorArraySize create(Scope scope, Operand<? extends TType> handle,
       Operand<TFloat32> flowIn) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArraySize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArraySize");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorArraySize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java
index f361bc23add..69fa801b51c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java
@@ -72,12 +72,11 @@ private TensorArraySplit(Operation operation) {
   )
   public static TensorArraySplit create(Scope scope, Operand<? extends TType> handle,
       Operand<? extends TType> value, Operand<TInt64> lengths, Operand<TFloat32> flowIn) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArraySplit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArraySplit");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(value.asOutput());
     opBuilder.addInput(lengths.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorArraySplit(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java
index d7136201b13..21d9122155f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java
@@ -61,11 +61,10 @@ private TensorArrayUnpack(Operation operation) {
   )
   public static TensorArrayUnpack create(Scope scope, Operand<TString> handle,
       Operand<? extends TType> value, Operand<TFloat32> flowIn) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayUnpack"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayUnpack");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(value.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorArrayUnpack(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java
index 9e3ffca2eb1..cb344c15cf2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java
@@ -62,12 +62,11 @@ private TensorArrayWrite(Operation operation) {
   )
   public static TensorArrayWrite create(Scope scope, Operand<? extends TType> handle,
       Operand<TInt32> index, Operand<? extends TType> value, Operand<TFloat32> flowIn) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayWrite"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorArrayWrite");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(index.asOutput());
     opBuilder.addInput(value.asOutput());
     opBuilder.addInput(flowIn.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorArrayWrite(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java
index e1626dedff5..c30cfe610c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java
@@ -80,11 +80,10 @@ private TensorListConcat(Operation operation) {
   public static <U extends TType> TensorListConcat<U> create(Scope scope,
       Operand<? extends TType> inputHandle, Operand<? extends TNumber> elementShape,
       Operand<TInt64> leadingDims, Class<U> elementDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListConcat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListConcat");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(elementShape.asOutput());
     opBuilder.addInput(leadingDims.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("element_dtype", Operands.toDataType(elementDtype));
     return new TensorListConcat<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcatLists.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcatLists.java
index 65a4178818f..3e2759d282f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcatLists.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcatLists.java
@@ -62,10 +62,9 @@ private TensorListConcatLists(Operation operation) {
   )
   public static <T extends TType> TensorListConcatLists create(Scope scope,
       Operand<? extends TType> inputA, Operand<? extends TType> inputB, Class<T> elementDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListConcatLists"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListConcatLists");
     opBuilder.addInput(inputA.asOutput());
     opBuilder.addInput(inputB.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("element_dtype", Operands.toDataType(elementDtype));
     return new TensorListConcatLists(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListElementShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListElementShape.java
index f11f7ba92b8..578a7978697 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListElementShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListElementShape.java
@@ -65,9 +65,8 @@ private TensorListElementShape(Operation operation) {
   )
   public static <T extends TNumber> TensorListElementShape<T> create(Scope scope,
       Operand<? extends TType> inputHandle, Class<T> shapeType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListElementShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListElementShape");
     opBuilder.addInput(inputHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("shape_type", Operands.toDataType(shapeType));
     return new TensorListElementShape<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java
index e648b9e7925..76f3a4c3c51 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java
@@ -63,10 +63,9 @@ private TensorListFromTensor(Operation operation) {
   )
   public static TensorListFromTensor create(Scope scope, Operand<? extends TType> tensor,
       Operand<? extends TNumber> elementShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListFromTensor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListFromTensor");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(elementShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListFromTensor(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGather.java
index b621bc1b849..41848040b03 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGather.java
@@ -71,11 +71,10 @@ private TensorListGather(Operation operation) {
   public static <T extends TType> TensorListGather<T> create(Scope scope,
       Operand<? extends TType> inputHandle, Operand<TInt32> indices, Operand<TInt32> elementShape,
       Class<T> elementDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListGather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListGather");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(elementShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("element_dtype", Operands.toDataType(elementDtype));
     return new TensorListGather<>(opBuilder.build());
   }
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 8e60428450d..61fdb9b41b6 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
@@ -66,11 +66,10 @@ private TensorListGetItem(Operation operation) {
   public static <T extends TType> TensorListGetItem<T> create(Scope scope,
       Operand<? extends TType> inputHandle, Operand<TInt32> index, Operand<TInt32> elementShape,
       Class<T> elementDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListGetItem"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListGetItem");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(index.asOutput());
     opBuilder.addInput(elementShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("element_dtype", Operands.toDataType(elementDtype));
     return new TensorListGetItem<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListLength.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListLength.java
index b1ffcaf318b..9fd22ca4a11 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListLength.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListLength.java
@@ -59,9 +59,8 @@ private TensorListLength(Operation operation) {
       describeByClass = true
   )
   public static TensorListLength create(Scope scope, Operand<? extends TType> inputHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListLength"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListLength");
     opBuilder.addInput(inputHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListLength(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPopBack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPopBack.java
index 26803f6c969..09b6bf41be9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPopBack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPopBack.java
@@ -73,10 +73,9 @@ private TensorListPopBack(Operation operation) {
   )
   public static <T extends TType> TensorListPopBack<T> create(Scope scope,
       Operand<? extends TType> inputHandle, Operand<TInt32> elementShape, Class<T> elementDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListPopBack"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListPopBack");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(elementShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("element_dtype", Operands.toDataType(elementDtype));
     return new TensorListPopBack<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java
index f8430d78de1..e347e64313d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java
@@ -64,10 +64,9 @@ private TensorListPushBack(Operation operation) {
   )
   public static TensorListPushBack create(Scope scope, Operand<? extends TType> inputHandle,
       Operand<? extends TType> tensor) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListPushBack"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListPushBack");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListPushBack(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java
index a2422a7eb8a..a48e5c5f2d4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java
@@ -59,10 +59,9 @@ private TensorListPushBackBatch(Operation operation) {
   )
   public static TensorListPushBackBatch create(Scope scope, Operand<? extends TType> inputHandles,
       Operand<? extends TType> tensor) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListPushBackBatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListPushBackBatch");
     opBuilder.addInput(inputHandles.asOutput());
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListPushBackBatch(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java
index 003cf6a7398..923592b48be 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java
@@ -68,10 +68,9 @@ private TensorListReserve(Operation operation) {
   )
   public static <U extends TType> TensorListReserve create(Scope scope,
       Operand<? extends TNumber> elementShape, Operand<TInt32> numElements, Class<U> elementDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListReserve"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListReserve");
     opBuilder.addInput(elementShape.asOutput());
     opBuilder.addInput(numElements.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("element_dtype", Operands.toDataType(elementDtype));
     return new TensorListReserve(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListResize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListResize.java
index f22b6c53912..5642bc4ba3a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListResize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListResize.java
@@ -62,10 +62,9 @@ private TensorListResize(Operation operation) {
   )
   public static TensorListResize create(Scope scope, Operand<? extends TType> inputHandle,
       Operand<TInt32> sizeOutput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListResize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListResize");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListResize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java
index 84f160b19a0..efc6c1b57e6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java
@@ -74,12 +74,11 @@ private TensorListScatter(Operation operation) {
   public static TensorListScatter create(Scope scope, Operand<? extends TType> tensor,
       Operand<TInt32> indices, Operand<? extends TNumber> elementShape,
       Operand<TInt32> numElements) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListScatter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListScatter");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(elementShape.asOutput());
     opBuilder.addInput(numElements.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListScatter(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java
index 507d14a13b5..6365d722f80 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java
@@ -68,11 +68,10 @@ private TensorListScatterIntoExistingList(Operation operation) {
   public static TensorListScatterIntoExistingList create(Scope scope,
       Operand<? extends TType> inputHandle, Operand<? extends TType> tensor,
       Operand<TInt32> indices) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListScatterIntoExistingList"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListScatterIntoExistingList");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListScatterIntoExistingList(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java
index 02a21f13825..6974ee0a1a1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java
@@ -61,11 +61,10 @@ private TensorListSetItem(Operation operation) {
   )
   public static TensorListSetItem create(Scope scope, Operand<? extends TType> inputHandle,
       Operand<TInt32> index, Operand<? extends TType> item) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListSetItem"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListSetItem");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(index.asOutput());
     opBuilder.addInput(item.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListSetItem(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java
index d25f9951ad7..18987c1c9ef 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java
@@ -68,11 +68,10 @@ private TensorListSplit(Operation operation) {
   )
   public static TensorListSplit create(Scope scope, Operand<? extends TType> tensor,
       Operand<? extends TNumber> elementShape, Operand<TInt64> lengths) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListSplit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListSplit");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(elementShape.asOutput());
     opBuilder.addInput(lengths.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorListSplit(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListStack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListStack.java
index 7c52d4a45b0..28c33663b69 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListStack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListStack.java
@@ -70,10 +70,9 @@ private TensorListStack(Operation operation) {
   public static <T extends TType> TensorListStack<T> create(Scope scope,
       Operand<? extends TType> inputHandle, Operand<TInt32> elementShape, Class<T> elementDtype,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListStack"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorListStack");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(elementShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("element_dtype", Operands.toDataType(elementDtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapErase.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapErase.java
index 83fa8e612f5..a714154cb25 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapErase.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapErase.java
@@ -65,10 +65,9 @@ private TensorMapErase(Operation operation) {
   )
   public static <U extends TType> TensorMapErase create(Scope scope,
       Operand<? extends TType> inputHandle, Operand<? extends TType> key, Class<U> valueDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapErase"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorMapErase");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(key.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype));
     return new TensorMapErase(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapHasKey.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapHasKey.java
index ce03b661d5f..99bbff077b5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapHasKey.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapHasKey.java
@@ -62,10 +62,9 @@ private TensorMapHasKey(Operation operation) {
   )
   public static TensorMapHasKey create(Scope scope, Operand<? extends TType> inputHandle,
       Operand<? extends TType> key) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapHasKey"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorMapHasKey");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(key.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorMapHasKey(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapInsert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapInsert.java
index 903d39736c7..c51ea51b187 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapInsert.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapInsert.java
@@ -64,11 +64,10 @@ private TensorMapInsert(Operation operation) {
   )
   public static TensorMapInsert create(Scope scope, Operand<? extends TType> inputHandle,
       Operand<? extends TType> key, Operand<? extends TType> value) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapInsert"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorMapInsert");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorMapInsert(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapLookup.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapLookup.java
index be0682edec5..74455fd3cba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapLookup.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapLookup.java
@@ -66,10 +66,9 @@ private TensorMapLookup(Operation operation) {
   )
   public static <U extends TType> TensorMapLookup<U> create(Scope scope,
       Operand<? extends TType> inputHandle, Operand<? extends TType> key, Class<U> valueDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapLookup"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorMapLookup");
     opBuilder.addInput(inputHandle.asOutput());
     opBuilder.addInput(key.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype));
     return new TensorMapLookup<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapSize.java
index 31d7d712ac6..aac7031a7ec 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapSize.java
@@ -59,9 +59,8 @@ private TensorMapSize(Operation operation) {
       describeByClass = true
   )
   public static TensorMapSize create(Scope scope, Operand<? extends TType> inputHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapSize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorMapSize");
     opBuilder.addInput(inputHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorMapSize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapStackKeys.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapStackKeys.java
index eb57059c093..968e251c9ec 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapStackKeys.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapStackKeys.java
@@ -64,9 +64,8 @@ private TensorMapStackKeys(Operation operation) {
   )
   public static <T extends TType> TensorMapStackKeys<T> create(Scope scope,
       Operand<? extends TType> inputHandle, Class<T> keyDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapStackKeys"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorMapStackKeys");
     opBuilder.addInput(inputHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("key_dtype", Operands.toDataType(keyDtype));
     return new TensorMapStackKeys<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java
index 8e105625cb7..d3ab1b40ef3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java
@@ -32,7 +32,7 @@
  * Adds sparse {@code updates} to an existing tensor according to {@code indices}.
  * This operation creates a new tensor by adding sparse {@code updates} to the passed
  * in {@code tensor}.
- * This operation is very similar to {@code tf.scatter_nd_add}, except that the updates
+ * This operation is very similar to {@code tf.compat.v1.scatter_nd_add}, except that the updates
  * are added onto an existing tensor (as opposed to a variable). If the memory
  * for the existing tensor cannot be re-used, a copy is made and updated.
  * <p>{@code indices} is an integer tensor containing indices into a new tensor of shape
@@ -119,11 +119,10 @@ private TensorScatterNdAdd(Operation operation) {
   )
   public static <T extends TType> TensorScatterNdAdd<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> indices, Operand<T> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorScatterNdAdd");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorScatterNdAdd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java
index 3bf063821f3..19e3b4e8a53 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java
@@ -63,11 +63,10 @@ private TensorScatterNdMax(Operation operation) {
   )
   public static <T extends TType> TensorScatterNdMax<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> indices, Operand<T> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorScatterNdMax");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorScatterNdMax<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java
index 4f81fbdb4c4..d8c54e576d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java
@@ -63,11 +63,10 @@ private TensorScatterNdMin(Operation operation) {
   )
   public static <T extends TType> TensorScatterNdMin<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> indices, Operand<T> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorScatterNdMin");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorScatterNdMin<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java
index 8a0c995c50e..0cf16e8e677 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java
@@ -118,11 +118,10 @@ private TensorScatterNdSub(Operation operation) {
   )
   public static <T extends TType> TensorScatterNdSub<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> indices, Operand<T> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdSub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorScatterNdSub");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorScatterNdSub<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java
index d62c4ccf4f1..0ed584af1b8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java
@@ -92,11 +92,10 @@ private TensorScatterNdUpdate(Operation operation) {
   )
   public static <T extends TType> TensorScatterNdUpdate<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> indices, Operand<T> updates) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdUpdate"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorScatterNdUpdate");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorScatterNdUpdate<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorStridedSliceUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorStridedSliceUpdate.java
index 5fab7af8134..58d071b28c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorStridedSliceUpdate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorStridedSliceUpdate.java
@@ -73,13 +73,12 @@ private TensorStridedSliceUpdate(Operation operation) {
   public static <T extends TType, U extends TNumber> TensorStridedSliceUpdate<T> create(Scope scope,
       Operand<T> input, Operand<U> begin, Operand<U> end, Operand<U> strides, Operand<T> value,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorStridedSliceUpdate"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorStridedSliceUpdate");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(begin.asOutput());
     opBuilder.addInput(end.asOutput());
     opBuilder.addInput(strides.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.beginMask != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java
index b675f1e3375..a417dea0725 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java
@@ -93,10 +93,9 @@ private Tile(Operation operation) {
   )
   public static <T extends TType> Tile<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> multiples) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Tile"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Tile");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(multiples.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Tile<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Timestamp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Timestamp.java
index cae24f7dee1..2c017c1cd51 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Timestamp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Timestamp.java
@@ -58,8 +58,7 @@ private Timestamp(Operation operation) {
       describeByClass = true
   )
   public static Timestamp create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Timestamp"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Timestamp");
     return new Timestamp(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKUnique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKUnique.java
index ed6c6344bff..5d20c9f2160 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKUnique.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKUnique.java
@@ -73,9 +73,8 @@ private TopKUnique(Operation operation) {
       describeByClass = true
   )
   public static TopKUnique create(Scope scope, Operand<TFloat32> input, Long k) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TopKUnique"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TopKUnique");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("k", k);
     return new TopKUnique(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKWithUnique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKWithUnique.java
index 571faba5d2e..e0e4d468a0f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKWithUnique.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKWithUnique.java
@@ -66,9 +66,8 @@ private TopKWithUnique(Operation operation) {
       describeByClass = true
   )
   public static TopKWithUnique create(Scope scope, Operand<TFloat32> input, Long k) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TopKWithUnique"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TopKWithUnique");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("k", k);
     return new TopKWithUnique(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unbatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unbatch.java
index ec0ea5bacb7..00c93f97129 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unbatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unbatch.java
@@ -82,11 +82,10 @@ private Unbatch(Operation operation) {
   )
   public static <T extends TType> Unbatch<T> create(Scope scope, Operand<T> batchedTensor,
       Operand<TInt64> batchIndex, Operand<TInt64> id, Long timeoutMicros, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Unbatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Unbatch");
     opBuilder.addInput(batchedTensor.asOutput());
     opBuilder.addInput(batchIndex.asOutput());
     opBuilder.addInput(id.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("timeout_micros", timeoutMicros);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnbatchGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnbatchGrad.java
index 7f91db16730..877fda71471 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnbatchGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnbatchGrad.java
@@ -78,12 +78,11 @@ private UnbatchGrad(Operation operation) {
   )
   public static <T extends TType> UnbatchGrad<T> create(Scope scope, Operand<T> originalInput,
       Operand<TInt64> batchIndex, Operand<T> grad, Operand<TInt64> id, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnbatchGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnbatchGrad");
     opBuilder.addInput(originalInput.asOutput());
     opBuilder.addInput(batchIndex.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(id.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java
index c7defd3c68e..7fec4d36cce 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java
@@ -108,10 +108,9 @@ private Unique(Operation operation) {
   )
   public static <T extends TType, V extends TNumber> Unique<T, V> create(Scope scope, Operand<T> x,
       Operand<? extends TNumber> axis, Class<V> outIdx) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Unique"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Unique");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_idx", Operands.toDataType(outIdx));
     return new Unique<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java
index d13f73f2434..9ccfcc22319 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java
@@ -115,10 +115,9 @@ private UniqueWithCounts(Operation operation) {
   )
   public static <T extends TType, V extends TNumber> UniqueWithCounts<T, V> create(Scope scope,
       Operand<T> x, Operand<? extends TNumber> axis, Class<V> outIdx) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UniqueWithCounts"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UniqueWithCounts");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_idx", Operands.toDataType(outIdx));
     return new UniqueWithCounts<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnravelIndex.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnravelIndex.java
index e2529c9468f..4a603b49357 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnravelIndex.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnravelIndex.java
@@ -80,10 +80,9 @@ private UnravelIndex(Operation operation) {
   )
   public static <T extends TNumber> UnravelIndex<T> create(Scope scope, Operand<T> indices,
       Operand<T> dims) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnravelIndex"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnravelIndex");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(dims.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new UnravelIndex<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstack.java
index 7d2ac838859..19d4e08c44e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstack.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstack.java
@@ -77,9 +77,8 @@ private Unstack(Operation operation) {
   )
   public static <T extends TType> Unstack<T> create(Scope scope, Operand<T> value, Long num,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Unstack"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Unstack");
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num", num);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstage.java
index 36a6a6eedc3..a0cd29d2014 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstage.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstage.java
@@ -67,8 +67,7 @@ private Unstage(Operation operation) {
   )
   public static Unstage create(Scope scope, List<Class<? extends TType>> dtypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Unstage"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Unstage");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UpperBound.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UpperBound.java
index 8e03195ee42..23a292eeaf7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UpperBound.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UpperBound.java
@@ -78,10 +78,9 @@ private UpperBound(Operation operation) {
   )
   public static <U extends TNumber, T extends TType> UpperBound<U> create(Scope scope,
       Operand<T> sortedInputs, Operand<T> values, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UpperBound"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UpperBound");
     opBuilder.addInput(sortedInputs.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new UpperBound<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarHandleOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarHandleOp.java
index 8aaf4953410..465941df1ab 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarHandleOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarHandleOp.java
@@ -66,8 +66,7 @@ private VarHandleOp(Operation operation) {
   )
   public static <T extends TType> VarHandleOp create(Scope scope, Class<T> dtype, Shape shape,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("VarHandleOp"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "VarHandleOp");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("shape", shape);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarIsInitializedOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarIsInitializedOp.java
index 2dacf759b88..93e9feb7f44 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarIsInitializedOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarIsInitializedOp.java
@@ -57,9 +57,8 @@ private VarIsInitializedOp(Operation operation) {
       describeByClass = true
   )
   public static VarIsInitializedOp create(Scope scope, Operand<? extends TType> resource) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("VarIsInitializedOp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "VarIsInitializedOp");
     opBuilder.addInput(resource.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new VarIsInitializedOp(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Variable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Variable.java
index ac2d7bb369a..04b8a8df6f1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Variable.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Variable.java
@@ -67,8 +67,7 @@ private Variable(Operation operation) {
   )
   public static <T extends TType> Variable<T> create(Scope scope, Shape shape, Class<T> dtype,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Variable"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Variable");
     opBuilder.setAttr("shape", shape);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VariableShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VariableShape.java
index b2c21f4238a..a026bd66862 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VariableShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VariableShape.java
@@ -70,9 +70,8 @@ private VariableShape(Operation operation) {
   )
   public static <T extends TNumber> VariableShape<T> create(Scope scope,
       Operand<? extends TType> input, Class<T> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("VariableShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "VariableShape");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new VariableShape<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java
index a3323a8d5d5..fefc32b1675 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java
@@ -114,9 +114,8 @@ private Where(Operation operation) {
       describeByClass = true
   )
   public static Where create(Scope scope, Operand<? extends TType> condition) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Where"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Where");
     opBuilder.addInput(condition.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Where(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Window.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Window.java
new file mode 100644
index 00000000000..e10608a3782
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Window.java
@@ -0,0 +1,89 @@
+/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================*/
+
+// This class has been generated, DO NOT EDIT!
+
+package org.tensorflow.op.core;
+
+import java.util.List;
+import org.tensorflow.Operand;
+import org.tensorflow.Operation;
+import org.tensorflow.OperationBuilder;
+import org.tensorflow.Output;
+import org.tensorflow.ndarray.Shape;
+import org.tensorflow.op.Operands;
+import org.tensorflow.op.RawOp;
+import org.tensorflow.op.Scope;
+import org.tensorflow.op.annotation.Endpoint;
+import org.tensorflow.types.family.TType;
+
+/**
+ * The Window operation
+ */
+public final class Window extends RawOp implements Operand<TType> {
+  /**
+   * The name of this op, as known by TensorFlow core engine
+   */
+  public static final String OP_NAME = "Window";
+
+  private Output<? extends TType> handle;
+
+  @SuppressWarnings("unchecked")
+  private Window(Operation operation) {
+    super(operation);
+    int outputIdx = 0;
+    handle = operation.output(outputIdx++);
+  }
+
+  /**
+   * Factory method to create a class wrapping a new Window operation.
+   *
+   * @param scope current scope
+   * @param inputs the inputs value
+   * @param outputTypes the value of the outputTypes property
+   * @param outputShapes the value of the outputShapes property
+   * @return a new instance of Window
+   */
+  @Endpoint(
+      describeByClass = true
+  )
+  public static Window create(Scope scope, Iterable<Operand<?>> inputs,
+      List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Window");
+    opBuilder.addInputList(Operands.asOutputs(inputs));
+    opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
+    Shape[] outputShapesArray = new Shape[outputShapes.size()];
+    for (int i = 0 ; i < outputShapesArray.length ; i++) {
+      outputShapesArray[i] = outputShapes.get(i);
+    }
+    opBuilder.setAttr("output_shapes", outputShapesArray);
+    return new Window(opBuilder.build());
+  }
+
+  /**
+   * Gets handle.
+   *
+   * @return handle.
+   */
+  public Output<? extends TType> handle() {
+    return handle;
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public Output<TType> asOutput() {
+    return (Output<TType>) handle;
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ZerosLike.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ZerosLike.java
index 3a0da9958cc..815c4adcc41 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ZerosLike.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ZerosLike.java
@@ -59,9 +59,8 @@ private ZerosLike(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> ZerosLike<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ZerosLike"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ZerosLike");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ZerosLike<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousIterator.java
index fc728c1439c..b6d11b4598b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousIterator.java
@@ -66,8 +66,7 @@ private AnonymousIterator(Operation operation) {
   )
   public static AnonymousIterator create(Scope scope, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousIterator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AnonymousIterator");
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMemoryCache.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMemoryCache.java
index 438e8eb4374..4a24a88e1ca 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMemoryCache.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMemoryCache.java
@@ -56,8 +56,7 @@ private AnonymousMemoryCache(Operation operation) {
       describeByClass = true
   )
   public static AnonymousMemoryCache create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousMemoryCache"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AnonymousMemoryCache");
     return new AnonymousMemoryCache(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMultiDeviceIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMultiDeviceIterator.java
index ccccad32cf8..362ff05583e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMultiDeviceIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMultiDeviceIterator.java
@@ -63,8 +63,7 @@ private AnonymousMultiDeviceIterator(Operation operation) {
   )
   public static AnonymousMultiDeviceIterator create(Scope scope, List<String> devices,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousMultiDeviceIterator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AnonymousMultiDeviceIterator");
     String[] devicesArray = new String[devices.size()];
     for (int i = 0 ; i < devicesArray.length ; i++) {
       devicesArray[i] = devices.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertCardinalityDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertCardinalityDataset.java
index f23c263c973..766e8632d32 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertCardinalityDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertCardinalityDataset.java
@@ -68,10 +68,9 @@ private AssertCardinalityDataset(Operation operation) {
   public static AssertCardinalityDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> cardinality, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssertCardinalityDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssertCardinalityDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(cardinality.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertNextDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertNextDataset.java
index 193a9c7e21f..d6598f345a2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertNextDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertNextDataset.java
@@ -77,10 +77,9 @@ private AssertNextDataset(Operation operation) {
   public static AssertNextDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> transformations, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssertNextDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssertNextDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(transformations.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AutoShardDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AutoShardDataset.java
index fd68bffe522..616e51b9948 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AutoShardDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AutoShardDataset.java
@@ -76,11 +76,10 @@ private AutoShardDataset(Operation operation) {
   public static AutoShardDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> numWorkers, Operand<TInt64> index, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AutoShardDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AutoShardDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(numWorkers.asOutput());
     opBuilder.addInput(index.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BatchDataset.java
index b58045697f4..9443135081b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BatchDataset.java
@@ -72,11 +72,10 @@ private BatchDataset(Operation operation) {
   public static BatchDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> batchSize, Operand<TBool> dropRemainder,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(batchSize.asOutput());
     opBuilder.addInput(dropRemainder.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BytesProducedStatsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BytesProducedStatsDataset.java
index 2bea64b5ee9..3eb3923a58c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BytesProducedStatsDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BytesProducedStatsDataset.java
@@ -67,10 +67,9 @@ private BytesProducedStatsDataset(Operation operation) {
   )
   public static BytesProducedStatsDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> tag, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BytesProducedStatsDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BytesProducedStatsDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(tag.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDataset.java
index 321cfb95669..36f923b377f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDataset.java
@@ -79,7 +79,7 @@ public static CSVDataset create(Scope scope, Operand<TString> filenames,
       Operand<TString> fieldDelim, Operand<TBool> useQuoteDelim, Operand<TString> naValue,
       Operand<TInt64> selectCols, Iterable<Operand<?>> recordDefaults, Operand<TInt64> excludeCols,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSVDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CSVDataset");
     opBuilder.addInput(filenames.asOutput());
     opBuilder.addInput(compressionType.asOutput());
     opBuilder.addInput(bufferSize.asOutput());
@@ -90,7 +90,6 @@ public static CSVDataset create(Scope scope, Operand<TString> filenames,
     opBuilder.addInput(selectCols.asOutput());
     opBuilder.addInputList(Operands.asOutputs(recordDefaults));
     opBuilder.addInput(excludeCols.asOutput());
-    opBuilder = scope.apply(opBuilder);
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
       outputShapesArray[i] = outputShapes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDataset.java
index b9903b62d21..a52a8fba718 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDataset.java
@@ -69,11 +69,10 @@ private CacheDataset(Operation operation) {
   public static CacheDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> filename, Operand<? extends TType> cache,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CacheDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CacheDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(filename.asOutput());
     opBuilder.addInput(cache.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestBranchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestBranchDataset.java
index 5623bcf21b5..6a5cd6ae86f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestBranchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestBranchDataset.java
@@ -76,12 +76,11 @@ public static ChooseFastestBranchDataset create(Scope scope,
       Operand<TInt64> ratioDenominator, Iterable<Operand<?>> otherArguments,
       Long numElementsPerBranch, List<ConcreteFunction> branches, List<Long> otherArgumentsLengths,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ChooseFastestBranchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ChooseFastestBranchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(ratioNumerator.asOutput());
     opBuilder.addInput(ratioDenominator.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_elements_per_branch", numElementsPerBranch);
     ConcreteFunction[] branchesArray = new ConcreteFunction[branches.size()];
     for (int i = 0 ; i < branchesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestDataset.java
index e5c26edcba8..bec675ca410 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestDataset.java
@@ -67,9 +67,8 @@ private ChooseFastestDataset(Operation operation) {
   public static ChooseFastestDataset create(Scope scope,
       Iterable<Operand<? extends TType>> inputDatasets, Long numExperiments,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ChooseFastestDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ChooseFastestDataset");
     opBuilder.addInputList(Operands.asOutputs(inputDatasets));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_experiments", numExperiments);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CompressElement.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CompressElement.java
index 10be8060ede..270538bf6a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CompressElement.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CompressElement.java
@@ -56,9 +56,8 @@ private CompressElement(Operation operation) {
       describeByClass = true
   )
   public static CompressElement create(Scope scope, Iterable<Operand<?>> components) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CompressElement"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CompressElement");
     opBuilder.addInputList(Operands.asOutputs(components));
-    opBuilder = scope.apply(opBuilder);
     return new CompressElement(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ConcatenateDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ConcatenateDataset.java
index 5e692b0fbc8..0bc81bd18a2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ConcatenateDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ConcatenateDataset.java
@@ -67,10 +67,9 @@ private ConcatenateDataset(Operation operation) {
   public static ConcatenateDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<? extends TType> anotherDataset, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConcatenateDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ConcatenateDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(anotherDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DataServiceDatasetV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DataServiceDatasetV2.java
index 69c97855be0..2ee876e396f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DataServiceDatasetV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DataServiceDatasetV2.java
@@ -79,7 +79,7 @@ public static DataServiceDatasetV2 create(Scope scope, Operand<TInt64> datasetId
       Operand<TString> jobName, Operand<TInt64> consumerIndex, Operand<TInt64> numConsumers,
       Operand<TInt64> maxOutstandingRequests, Operand<? extends TType> iterationCounter,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DataServiceDatasetV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DataServiceDatasetV2");
     opBuilder.addInput(datasetId.asOutput());
     opBuilder.addInput(processingMode.asOutput());
     opBuilder.addInput(address.asOutput());
@@ -89,7 +89,6 @@ public static DataServiceDatasetV2 create(Scope scope, Operand<TInt64> datasetId
     opBuilder.addInput(numConsumers.asOutput());
     opBuilder.addInput(maxOutstandingRequests.asOutput());
     opBuilder.addInput(iterationCounter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
@@ -104,6 +103,9 @@ public static DataServiceDatasetV2 create(Scope scope, Operand<TInt64> datasetId
         if (opts.dataTransferProtocol != null) {
           opBuilder.setAttr("data_transfer_protocol", opts.dataTransferProtocol);
         }
+        if (opts.targetWorkers != null) {
+          opBuilder.setAttr("target_workers", opts.targetWorkers);
+        }
       }
     }
     return new DataServiceDatasetV2(opBuilder.build());
@@ -129,6 +131,16 @@ public static Options dataTransferProtocol(String dataTransferProtocol) {
     return new Options().dataTransferProtocol(dataTransferProtocol);
   }
 
+  /**
+   * Sets the targetWorkers option.
+   *
+   * @param targetWorkers the targetWorkers option
+   * @return this Options instance.
+   */
+  public static Options targetWorkers(String targetWorkers) {
+    return new Options().targetWorkers(targetWorkers);
+  }
+
   /**
    * Gets handle.
    *
@@ -152,6 +164,8 @@ public static class Options {
 
     private String dataTransferProtocol;
 
+    private String targetWorkers;
+
     private Options() {
     }
 
@@ -176,5 +190,16 @@ public Options dataTransferProtocol(String dataTransferProtocol) {
       this.dataTransferProtocol = dataTransferProtocol;
       return this;
     }
+
+    /**
+     * Sets the targetWorkers option.
+     *
+     * @param targetWorkers the targetWorkers option
+     * @return this Options instance.
+     */
+    public Options targetWorkers(String targetWorkers) {
+      this.targetWorkers = targetWorkers;
+      return this;
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetCardinality.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetCardinality.java
index 8ec90a071c5..72216097974 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetCardinality.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetCardinality.java
@@ -60,9 +60,8 @@ private DatasetCardinality(Operation operation) {
       describeByClass = true
   )
   public static DatasetCardinality create(Scope scope, Operand<? extends TType> inputDataset) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetCardinality"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DatasetCardinality");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DatasetCardinality(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetFromGraph.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetFromGraph.java
index d54a9ce08de..c794a89a65d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetFromGraph.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetFromGraph.java
@@ -61,9 +61,8 @@ private DatasetFromGraph(Operation operation) {
       describeByClass = true
   )
   public static DatasetFromGraph create(Scope scope, Operand<TString> graphDef) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetFromGraph"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DatasetFromGraph");
     opBuilder.addInput(graphDef.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DatasetFromGraph(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToGraph.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToGraph.java
index d799766128b..0177a116cbe 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToGraph.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToGraph.java
@@ -62,9 +62,8 @@ private DatasetToGraph(Operation operation) {
   )
   public static DatasetToGraph create(Scope scope, Operand<? extends TType> inputDataset,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetToGraph"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DatasetToGraph");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.externalStatePolicy != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToSingleElement.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToSingleElement.java
index 9b302486b3b..f5b779ed6bc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToSingleElement.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToSingleElement.java
@@ -69,9 +69,8 @@ private DatasetToSingleElement(Operation operation) {
   )
   public static DatasetToSingleElement create(Scope scope, Operand<? extends TType> dataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetToSingleElement"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DatasetToSingleElement");
     opBuilder.addInput(dataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToTfRecord.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToTfRecord.java
index 9e8b386200f..bb4b58da845 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToTfRecord.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToTfRecord.java
@@ -58,11 +58,10 @@ private DatasetToTfRecord(Operation operation) {
   )
   public static DatasetToTfRecord create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> filename, Operand<TString> compressionType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetToTfRecord"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DatasetToTfRecord");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(filename.asOutput());
     opBuilder.addInput(compressionType.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DatasetToTfRecord(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteIterator.java
index ce6cc297f2f..0a696c8288e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteIterator.java
@@ -55,10 +55,9 @@ private DeleteIterator(Operation operation) {
   )
   public static DeleteIterator create(Scope scope, Operand<? extends TType> handle,
       Operand<? extends TType> deleter) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteIterator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeleteIterator");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(deleter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DeleteIterator(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMemoryCache.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMemoryCache.java
index 80dab58ffca..c4b3b450727 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMemoryCache.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMemoryCache.java
@@ -51,10 +51,9 @@ private DeleteMemoryCache(Operation operation) {
   )
   public static DeleteMemoryCache create(Scope scope, Operand<? extends TType> handle,
       Operand<? extends TType> deleter) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteMemoryCache"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeleteMemoryCache");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(deleter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DeleteMemoryCache(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMultiDeviceIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMultiDeviceIterator.java
index 9dc5f5aef82..af43926e234 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMultiDeviceIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMultiDeviceIterator.java
@@ -54,11 +54,10 @@ private DeleteMultiDeviceIterator(Operation operation) {
   public static DeleteMultiDeviceIterator create(Scope scope,
       Operand<? extends TType> multiDeviceIterator, Iterable<Operand<? extends TType>> iterators,
       Operand<? extends TType> deleter) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteMultiDeviceIterator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeleteMultiDeviceIterator");
     opBuilder.addInput(multiDeviceIterator.asOutput());
     opBuilder.addInputList(Operands.asOutputs(iterators));
     opBuilder.addInput(deleter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DeleteMultiDeviceIterator(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DenseToSparseBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DenseToSparseBatchDataset.java
index ecea765507d..d507b656d58 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DenseToSparseBatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DenseToSparseBatchDataset.java
@@ -72,11 +72,10 @@ private DenseToSparseBatchDataset(Operation operation) {
   public static DenseToSparseBatchDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> batchSize, Operand<TInt64> rowShape, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToSparseBatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DenseToSparseBatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(batchSize.asOutput());
     opBuilder.addInput(rowShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeserializeIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeserializeIterator.java
index 0a408b40593..a7254cf58ea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeserializeIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeserializeIterator.java
@@ -56,10 +56,9 @@ private DeserializeIterator(Operation operation) {
   )
   public static DeserializeIterator create(Scope scope, Operand<? extends TType> resourceHandle,
       Operand<? extends TType> serialized) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeserializeIterator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeserializeIterator");
     opBuilder.addInput(resourceHandle.asOutput());
     opBuilder.addInput(serialized.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DeserializeIterator(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DirectedInterleaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DirectedInterleaveDataset.java
index 58637eb9f7f..93fa60508a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DirectedInterleaveDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DirectedInterleaveDataset.java
@@ -61,6 +61,7 @@ private DirectedInterleaveDataset(Operation operation) {
    * the values of {@code selector_input_dataset}.
    * @param outputTypes the value of the outputTypes property
    * @param outputShapes the value of the outputShapes property
+   * @param options carries optional attribute values
    * @return a new instance of DirectedInterleaveDataset
    */
   @Endpoint(
@@ -69,20 +70,36 @@ private DirectedInterleaveDataset(Operation operation) {
   public static DirectedInterleaveDataset create(Scope scope,
       Operand<? extends TType> selectorInputDataset,
       Iterable<Operand<? extends TType>> dataInputDatasets,
-      List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DirectedInterleaveDataset"));
+      List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DirectedInterleaveDataset");
     opBuilder.addInput(selectorInputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(dataInputDatasets));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
       outputShapesArray[i] = outputShapes.get(i);
     }
     opBuilder.setAttr("output_shapes", outputShapesArray);
+    if (options != null) {
+      for (Options opts : options) {
+        if (opts.stopOnEmptyDataset != null) {
+          opBuilder.setAttr("stop_on_empty_dataset", opts.stopOnEmptyDataset);
+        }
+      }
+    }
     return new DirectedInterleaveDataset(opBuilder.build());
   }
 
+  /**
+   * Sets the stopOnEmptyDataset option.
+   *
+   * @param stopOnEmptyDataset the stopOnEmptyDataset option
+   * @return this Options instance.
+   */
+  public static Options stopOnEmptyDataset(Boolean stopOnEmptyDataset) {
+    return new Options().stopOnEmptyDataset(stopOnEmptyDataset);
+  }
+
   /**
    * Gets handle.
    *
@@ -97,4 +114,25 @@ public Output<? extends TType> handle() {
   public Output<TType> asOutput() {
     return (Output<TType>) handle;
   }
+
+  /**
+   * Optional attributes for {@link org.tensorflow.op.data.DirectedInterleaveDataset}
+   */
+  public static class Options {
+    private Boolean stopOnEmptyDataset;
+
+    private Options() {
+    }
+
+    /**
+     * Sets the stopOnEmptyDataset option.
+     *
+     * @param stopOnEmptyDataset the stopOnEmptyDataset option
+     * @return this Options instance.
+     */
+    public Options stopOnEmptyDataset(Boolean stopOnEmptyDataset) {
+      this.stopOnEmptyDataset = stopOnEmptyDataset;
+      return this;
+    }
+  }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DummyIterationCounter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DummyIterationCounter.java
index 3b6fcd763b7..837efe0f7b1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DummyIterationCounter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DummyIterationCounter.java
@@ -54,8 +54,7 @@ private DummyIterationCounter(Operation operation) {
       describeByClass = true
   )
   public static DummyIterationCounter create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DummyIterationCounter"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DummyIterationCounter");
     return new DummyIterationCounter(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterByLastComponentDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterByLastComponentDataset.java
index 0dfdd3eb57d..a2b08845e55 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterByLastComponentDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterByLastComponentDataset.java
@@ -66,9 +66,8 @@ private FilterByLastComponentDataset(Operation operation) {
   public static FilterByLastComponentDataset create(Scope scope,
       Operand<? extends TType> inputDataset, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FilterByLastComponentDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FilterByLastComponentDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterDataset.java
index 75f9b98aa8a..afdbd819ee7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterDataset.java
@@ -76,10 +76,9 @@ private FilterDataset(Operation operation) {
   public static FilterDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> otherArguments, ConcreteFunction predicate,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FilterDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FilterDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("predicate", predicate);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FinalizeDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FinalizeDataset.java
index a56b7d175bf..5c81b9c4d02 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FinalizeDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FinalizeDataset.java
@@ -66,9 +66,8 @@ private FinalizeDataset(Operation operation) {
   )
   public static FinalizeDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FinalizeDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FinalizeDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FixedLengthRecordDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FixedLengthRecordDataset.java
index adf6f2a31d4..3ff58fd3784 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FixedLengthRecordDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FixedLengthRecordDataset.java
@@ -68,14 +68,13 @@ private FixedLengthRecordDataset(Operation operation) {
   public static FixedLengthRecordDataset create(Scope scope, Operand<TString> filenames,
       Operand<TInt64> headerBytes, Operand<TInt64> recordBytes, Operand<TInt64> footerBytes,
       Operand<TInt64> bufferSize, Operand<TString> compressionType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FixedLengthRecordDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FixedLengthRecordDataset");
     opBuilder.addInput(filenames.asOutput());
     opBuilder.addInput(headerBytes.asOutput());
     opBuilder.addInput(recordBytes.asOutput());
     opBuilder.addInput(footerBytes.asOutput());
     opBuilder.addInput(bufferSize.asOutput());
     opBuilder.addInput(compressionType.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new FixedLengthRecordDataset(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FlatMapDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FlatMapDataset.java
index 6e4a48642ce..de6f6783271 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FlatMapDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FlatMapDataset.java
@@ -74,10 +74,9 @@ private FlatMapDataset(Operation operation) {
   public static FlatMapDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> otherArguments, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FlatMapDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FlatMapDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GeneratorDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GeneratorDataset.java
index 0887f089adb..be66d0404a9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GeneratorDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GeneratorDataset.java
@@ -73,11 +73,10 @@ public static GeneratorDataset create(Scope scope, Iterable<Operand<?>> initFunc
       Iterable<Operand<?>> nextFuncOtherArgs, Iterable<Operand<?>> finalizeFuncOtherArgs,
       ConcreteFunction initFunc, ConcreteFunction nextFunc, ConcreteFunction finalizeFunc,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GeneratorDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GeneratorDataset");
     opBuilder.addInputList(Operands.asOutputs(initFuncOtherArgs));
     opBuilder.addInputList(Operands.asOutputs(nextFuncOtherArgs));
     opBuilder.addInputList(Operands.asOutputs(finalizeFuncOtherArgs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("init_func", initFunc);
     opBuilder.setAttr("next_func", nextFunc);
     opBuilder.setAttr("finalize_func", finalizeFunc);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GroupByReducerDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GroupByReducerDataset.java
index e9c2828179e..51a104f84c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GroupByReducerDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GroupByReducerDataset.java
@@ -86,13 +86,12 @@ public static GroupByReducerDataset create(Scope scope, Operand<? extends TType>
       Iterable<Operand<?>> finalizeFuncOtherArguments, ConcreteFunction keyFunc,
       ConcreteFunction initFunc, ConcreteFunction reduceFunc, ConcreteFunction finalizeFunc,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GroupByReducerDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GroupByReducerDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(keyFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(initFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(reduceFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(finalizeFuncOtherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("key_func", keyFunc);
     opBuilder.setAttr("init_func", initFunc);
     opBuilder.setAttr("reduce_func", reduceFunc);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GroupByWindowDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GroupByWindowDataset.java
index f84ec83d20c..36c6568c109 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GroupByWindowDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/GroupByWindowDataset.java
@@ -77,12 +77,11 @@ public static GroupByWindowDataset create(Scope scope, Operand<? extends TType>
       Iterable<Operand<?>> windowSizeFuncOtherArguments, ConcreteFunction keyFunc,
       ConcreteFunction reduceFunc, ConcreteFunction windowSizeFunc,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GroupByWindowDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GroupByWindowDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(keyFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(reduceFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(windowSizeFuncOtherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("key_func", keyFunc);
     opBuilder.setAttr("reduce_func", reduceFunc);
     opBuilder.setAttr("window_size_func", windowSizeFunc);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IgnoreErrorsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IgnoreErrorsDataset.java
index 5eb18474f4f..25a819a79c6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IgnoreErrorsDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IgnoreErrorsDataset.java
@@ -66,9 +66,8 @@ private IgnoreErrorsDataset(Operation operation) {
   )
   public static IgnoreErrorsDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IgnoreErrorsDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IgnoreErrorsDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InitializeTableFromDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InitializeTableFromDataset.java
index 7afd248da3d..a63dbae17c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InitializeTableFromDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InitializeTableFromDataset.java
@@ -55,10 +55,9 @@ private InitializeTableFromDataset(Operation operation) {
   )
   public static InitializeTableFromDataset create(Scope scope, Operand<? extends TType> tableHandle,
       Operand<? extends TType> dataset) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InitializeTableFromDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InitializeTableFromDataset");
     opBuilder.addInput(tableHandle.asOutput());
     opBuilder.addInput(dataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new InitializeTableFromDataset(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InterleaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InterleaveDataset.java
index 64f177ec539..f9a53cdc80b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InterleaveDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InterleaveDataset.java
@@ -79,12 +79,11 @@ private InterleaveDataset(Operation operation) {
   public static InterleaveDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> otherArguments, Operand<TInt64> cycleLength, Operand<TInt64> blockLength,
       ConcreteFunction f, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InterleaveDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InterleaveDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
     opBuilder.addInput(cycleLength.asOutput());
     opBuilder.addInput(blockLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/Iterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/Iterator.java
index 8bd9e126fc0..455c8628554 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/Iterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/Iterator.java
@@ -66,8 +66,7 @@ private Iterator(Operation operation) {
   )
   public static Iterator create(Scope scope, String sharedName, String container,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Iterator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Iterator");
     opBuilder.setAttr("shared_name", sharedName);
     opBuilder.setAttr("container", container);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorFromStringHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorFromStringHandle.java
index cc39d3cf4ab..8d05ee3163c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorFromStringHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorFromStringHandle.java
@@ -63,9 +63,8 @@ private IteratorFromStringHandle(Operation operation) {
   )
   public static IteratorFromStringHandle create(Scope scope, Operand<TString> stringHandle,
       List<Class<? extends TType>> outputTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorFromStringHandle"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IteratorFromStringHandle");
     opBuilder.addInput(stringHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetDevice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetDevice.java
index 361ea83a46f..d772a2e5066 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetDevice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetDevice.java
@@ -55,9 +55,8 @@ private IteratorGetDevice(Operation operation) {
       describeByClass = true
   )
   public static IteratorGetDevice create(Scope scope, Operand<? extends TType> resource) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetDevice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IteratorGetDevice");
     opBuilder.addInput(resource.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IteratorGetDevice(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNext.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNext.java
index 03a19599760..5ef82bb3a3d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNext.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNext.java
@@ -69,9 +69,8 @@ private IteratorGetNext(Operation operation) {
   )
   public static IteratorGetNext create(Scope scope, Operand<? extends TType> iterator,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetNext"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IteratorGetNext");
     opBuilder.addInput(iterator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextAsOptional.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextAsOptional.java
index 250b712fec8..87cd3ef37ea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextAsOptional.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextAsOptional.java
@@ -65,9 +65,8 @@ private IteratorGetNextAsOptional(Operation operation) {
   )
   public static IteratorGetNextAsOptional create(Scope scope, Operand<? extends TType> iterator,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetNextAsOptional"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IteratorGetNextAsOptional");
     opBuilder.addInput(iterator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextSync.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextSync.java
index 0d011980d25..018f28dead3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextSync.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextSync.java
@@ -73,9 +73,8 @@ private IteratorGetNextSync(Operation operation) {
   )
   public static IteratorGetNextSync create(Scope scope, Operand<? extends TType> iterator,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetNextSync"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IteratorGetNextSync");
     opBuilder.addInput(iterator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorToStringHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorToStringHandle.java
index 418f2f385a8..4973206deba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorToStringHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorToStringHandle.java
@@ -60,9 +60,8 @@ private IteratorToStringHandle(Operation operation) {
   )
   public static IteratorToStringHandle create(Scope scope,
       Operand<? extends TType> resourceHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorToStringHandle"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IteratorToStringHandle");
     opBuilder.addInput(resourceHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IteratorToStringHandle(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LMDBDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LMDBDataset.java
index 9aef6cf746b..cad8616daa3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LMDBDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LMDBDataset.java
@@ -75,9 +75,8 @@ private LMDBDataset(Operation operation) {
   )
   public static LMDBDataset create(Scope scope, Operand<TString> filenames,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LMDBDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LMDBDataset");
     opBuilder.addInput(filenames.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LatencyStatsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LatencyStatsDataset.java
index 2d30dae30b2..73170c4fac0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LatencyStatsDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LatencyStatsDataset.java
@@ -67,10 +67,9 @@ private LatencyStatsDataset(Operation operation) {
   )
   public static LatencyStatsDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> tag, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LatencyStatsDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LatencyStatsDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(tag.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LeakyReluGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LeakyReluGrad.java
index 1377b71eefd..f54fcd92daa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LeakyReluGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LeakyReluGrad.java
@@ -61,10 +61,9 @@ private LeakyReluGrad(Operation operation) {
   )
   public static <T extends TNumber> LeakyReluGrad<T> create(Scope scope, Operand<T> gradients,
       Operand<T> features, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LeakyReluGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LeakyReluGrad");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alpha != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LegacyParallelInterleaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LegacyParallelInterleaveDataset.java
index 6f769b45b97..cde48b6c8ee 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LegacyParallelInterleaveDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LegacyParallelInterleaveDataset.java
@@ -86,14 +86,13 @@ public static LegacyParallelInterleaveDataset create(Scope scope,
       Operand<TInt64> bufferOutputElements, Operand<TInt64> prefetchInputElements,
       ConcreteFunction f, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LegacyParallelInterleaveDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LegacyParallelInterleaveDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
     opBuilder.addInput(cycleLength.asOutput());
     opBuilder.addInput(blockLength.asOutput());
     opBuilder.addInput(bufferOutputElements.asOutput());
     opBuilder.addInput(prefetchInputElements.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LoadDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LoadDataset.java
index 5897e41b71e..0d484822f0c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LoadDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LoadDataset.java
@@ -71,10 +71,9 @@ private LoadDataset(Operation operation) {
   public static LoadDataset create(Scope scope, Operand<TString> path,
       Iterable<Operand<?>> readerFuncOtherArgs, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, ConcreteFunction readerFunc, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadDataset");
     opBuilder.addInput(path.asOutput());
     opBuilder.addInputList(Operands.asOutputs(readerFuncOtherArgs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MakeIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MakeIterator.java
index 755c99bc39d..e4a39b2f495 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MakeIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MakeIterator.java
@@ -57,10 +57,9 @@ private MakeIterator(Operation operation) {
   )
   public static MakeIterator create(Scope scope, Operand<? extends TType> dataset,
       Operand<? extends TType> iterator) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MakeIterator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MakeIterator");
     opBuilder.addInput(dataset.asOutput());
     opBuilder.addInput(iterator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MakeIterator(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MapAndBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MapAndBatchDataset.java
index 3526f689b30..f45037d548f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MapAndBatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MapAndBatchDataset.java
@@ -86,13 +86,12 @@ public static MapAndBatchDataset create(Scope scope, Operand<? extends TType> in
       Iterable<Operand<?>> otherArguments, Operand<TInt64> batchSize,
       Operand<TInt64> numParallelCalls, Operand<TBool> dropRemainder, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapAndBatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapAndBatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
     opBuilder.addInput(batchSize.asOutput());
     opBuilder.addInput(numParallelCalls.asOutput());
     opBuilder.addInput(dropRemainder.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MapDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MapDataset.java
index 5232a58cd1d..872980cca18 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MapDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MapDataset.java
@@ -70,10 +70,9 @@ private MapDataset(Operation operation) {
   public static MapDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> otherArguments, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MatchingFilesDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MatchingFilesDataset.java
index d90d48a6011..8c7d3c019e3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MatchingFilesDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MatchingFilesDataset.java
@@ -60,9 +60,8 @@ private MatchingFilesDataset(Operation operation) {
       describeByClass = true
   )
   public static MatchingFilesDataset create(Scope scope, Operand<TString> patterns) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatchingFilesDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatchingFilesDataset");
     opBuilder.addInput(patterns.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MatchingFilesDataset(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MaxIntraOpParallelismDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MaxIntraOpParallelismDataset.java
index 406c90a988c..d32f1f39ae5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MaxIntraOpParallelismDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MaxIntraOpParallelismDataset.java
@@ -68,10 +68,9 @@ private MaxIntraOpParallelismDataset(Operation operation) {
   public static MaxIntraOpParallelismDataset create(Scope scope,
       Operand<? extends TType> inputDataset, Operand<TInt64> maxIntraOpParallelism,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxIntraOpParallelismDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxIntraOpParallelismDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(maxIntraOpParallelism.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ModelDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ModelDataset.java
index a88c103708f..0d200d35e3c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ModelDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ModelDataset.java
@@ -67,9 +67,8 @@ private ModelDataset(Operation operation) {
   )
   public static ModelDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ModelDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ModelDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIterator.java
index 082aaea89c8..41b1fe1e662 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIterator.java
@@ -65,8 +65,7 @@ private MultiDeviceIterator(Operation operation) {
   )
   public static MultiDeviceIterator create(Scope scope, List<String> devices, String sharedName,
       String container, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIterator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MultiDeviceIterator");
     String[] devicesArray = new String[devices.size()];
     for (int i = 0 ; i < devicesArray.length ; i++) {
       devicesArray[i] = devices.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorFromStringHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorFromStringHandle.java
index d9594a04d06..a1c0b1e529b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorFromStringHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorFromStringHandle.java
@@ -63,9 +63,8 @@ private MultiDeviceIteratorFromStringHandle(Operation operation) {
   )
   public static MultiDeviceIteratorFromStringHandle create(Scope scope,
       Operand<TString> stringHandle, List<Class<? extends TType>> outputTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIteratorFromStringHandle"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MultiDeviceIteratorFromStringHandle");
     opBuilder.addInput(stringHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorGetNextFromShard.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorGetNextFromShard.java
index 2c422c4872b..5015e405b51 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorGetNextFromShard.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorGetNextFromShard.java
@@ -71,11 +71,10 @@ public static MultiDeviceIteratorGetNextFromShard create(Scope scope,
       Operand<? extends TType> multiDeviceIterator, Operand<TInt32> shardNum,
       Operand<TInt64> incarnationId, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIteratorGetNextFromShard"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MultiDeviceIteratorGetNextFromShard");
     opBuilder.addInput(multiDeviceIterator.asOutput());
     opBuilder.addInput(shardNum.asOutput());
     opBuilder.addInput(incarnationId.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorInit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorInit.java
index 6b9db31cb82..aa62b899a44 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorInit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorInit.java
@@ -58,11 +58,10 @@ private MultiDeviceIteratorInit(Operation operation) {
   )
   public static MultiDeviceIteratorInit create(Scope scope, Operand<? extends TType> dataset,
       Operand<? extends TType> multiDeviceIterator, Operand<TInt64> maxBufferSize) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIteratorInit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MultiDeviceIteratorInit");
     opBuilder.addInput(dataset.asOutput());
     opBuilder.addInput(multiDeviceIterator.asOutput());
     opBuilder.addInput(maxBufferSize.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MultiDeviceIteratorInit(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorToStringHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorToStringHandle.java
index bf50da290f4..99f46b8f444 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorToStringHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorToStringHandle.java
@@ -56,9 +56,8 @@ private MultiDeviceIteratorToStringHandle(Operation operation) {
   )
   public static MultiDeviceIteratorToStringHandle create(Scope scope,
       Operand<? extends TType> multiDeviceIterator) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIteratorToStringHandle"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MultiDeviceIteratorToStringHandle");
     opBuilder.addInput(multiDeviceIterator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MultiDeviceIteratorToStringHandle(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/NonSerializableDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/NonSerializableDataset.java
index 7db69b45f8d..ed6ce16777e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/NonSerializableDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/NonSerializableDataset.java
@@ -65,9 +65,8 @@ private NonSerializableDataset(Operation operation) {
   )
   public static NonSerializableDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonSerializableDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NonSerializableDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OneShotIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OneShotIterator.java
index 59421497931..b37f927dc6d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OneShotIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OneShotIterator.java
@@ -84,8 +84,7 @@ private OneShotIterator(Operation operation) {
   )
   public static OneShotIterator create(Scope scope, ConcreteFunction datasetFactory,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OneShotIterator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OneShotIterator");
     opBuilder.setAttr("dataset_factory", datasetFactory);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDataset.java
index 7c1352a9e00..d3f4ddb5a42 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDataset.java
@@ -74,12 +74,11 @@ public static OptimizeDataset create(Scope scope, Operand<? extends TType> input
       Operand<TString> optimizationsEnabled, Operand<TString> optimizationsDisabled,
       Operand<TString> optimizationsDefault, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptimizeDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OptimizeDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(optimizationsEnabled.asOutput());
     opBuilder.addInput(optimizationsDisabled.asOutput());
     opBuilder.addInput(optimizationsDefault.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalFromValue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalFromValue.java
index 741e5532640..dc91514ef43 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalFromValue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalFromValue.java
@@ -60,9 +60,8 @@ private OptionalFromValue(Operation operation) {
       describeByClass = true
   )
   public static OptionalFromValue create(Scope scope, Iterable<Operand<?>> components) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionalFromValue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OptionalFromValue");
     opBuilder.addInputList(Operands.asOutputs(components));
-    opBuilder = scope.apply(opBuilder);
     return new OptionalFromValue(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalGetValue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalGetValue.java
index d255fc381fc..2ab14866899 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalGetValue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalGetValue.java
@@ -69,9 +69,8 @@ private OptionalGetValue(Operation operation) {
   )
   public static OptionalGetValue create(Scope scope, Operand<? extends TType> optional,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionalGetValue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OptionalGetValue");
     opBuilder.addInput(optional.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalHasValue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalHasValue.java
index 5de50ea6bd9..73b80f6e5a8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalHasValue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalHasValue.java
@@ -59,9 +59,8 @@ private OptionalHasValue(Operation operation) {
       describeByClass = true
   )
   public static OptionalHasValue create(Scope scope, Operand<? extends TType> optional) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionalHasValue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OptionalHasValue");
     opBuilder.addInput(optional.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new OptionalHasValue(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalNone.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalNone.java
index 062a2a9808f..8f19d2f0052 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalNone.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalNone.java
@@ -58,8 +58,7 @@ private OptionalNone(Operation operation) {
       describeByClass = true
   )
   public static OptionalNone create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionalNone"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OptionalNone");
     return new OptionalNone(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionsDataset.java
index 2ff6923fc71..ed6d4c382b5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionsDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionsDataset.java
@@ -67,9 +67,8 @@ private OptionsDataset(Operation operation) {
   public static OptionsDataset create(Scope scope, Operand<? extends TType> inputDataset,
       String serializedOptions, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionsDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OptionsDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("serialized_options", serializedOptions);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PaddedBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PaddedBatchDataset.java
index 058015155ea..9bd23430f4e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PaddedBatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PaddedBatchDataset.java
@@ -79,13 +79,12 @@ public static PaddedBatchDataset create(Scope scope, Operand<? extends TType> in
       Operand<TInt64> batchSize, Iterable<Operand<TInt64>> paddedShapes,
       Iterable<Operand<?>> paddingValues, Operand<TBool> dropRemainder, List<Shape> outputShapes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PaddedBatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PaddedBatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(batchSize.asOutput());
     opBuilder.addInputList(Operands.asOutputs(paddedShapes));
     opBuilder.addInputList(Operands.asOutputs(paddingValues));
     opBuilder.addInput(dropRemainder.asOutput());
-    opBuilder = scope.apply(opBuilder);
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
       outputShapesArray[i] = outputShapes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelBatchDataset.java
index f313afbf0b8..9d80c3b91f7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelBatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelBatchDataset.java
@@ -72,12 +72,11 @@ private ParallelBatchDataset(Operation operation) {
   public static ParallelBatchDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> batchSize, Operand<TInt64> numParallelCalls, Operand<TBool> dropRemainder,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelBatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParallelBatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(batchSize.asOutput());
     opBuilder.addInput(numParallelCalls.asOutput());
     opBuilder.addInput(dropRemainder.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
@@ -86,6 +85,9 @@ public static ParallelBatchDataset create(Scope scope, Operand<? extends TType>
     opBuilder.setAttr("output_shapes", outputShapesArray);
     if (options != null) {
       for (Options opts : options) {
+        if (opts.parallelCopy != null) {
+          opBuilder.setAttr("parallel_copy", opts.parallelCopy);
+        }
         if (opts.deterministic != null) {
           opBuilder.setAttr("deterministic", opts.deterministic);
         }
@@ -94,6 +96,16 @@ public static ParallelBatchDataset create(Scope scope, Operand<? extends TType>
     return new ParallelBatchDataset(opBuilder.build());
   }
 
+  /**
+   * Sets the parallelCopy option.
+   *
+   * @param parallelCopy the parallelCopy option
+   * @return this Options instance.
+   */
+  public static Options parallelCopy(Boolean parallelCopy) {
+    return new Options().parallelCopy(parallelCopy);
+  }
+
   /**
    * Sets the deterministic option.
    *
@@ -123,11 +135,24 @@ public Output<TType> asOutput() {
    * Optional attributes for {@link org.tensorflow.op.data.ParallelBatchDataset}
    */
   public static class Options {
+    private Boolean parallelCopy;
+
     private String deterministic;
 
     private Options() {
     }
 
+    /**
+     * Sets the parallelCopy option.
+     *
+     * @param parallelCopy the parallelCopy option
+     * @return this Options instance.
+     */
+    public Options parallelCopy(Boolean parallelCopy) {
+      this.parallelCopy = parallelCopy;
+      return this;
+    }
+
     /**
      * Sets the deterministic option.
      *
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelInterleaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelInterleaveDataset.java
index bf87079b34c..07ac0e6f59a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelInterleaveDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelInterleaveDataset.java
@@ -99,7 +99,7 @@ public static ParallelInterleaveDataset create(Scope scope, Operand<? extends TT
       Operand<TInt64> bufferOutputElements, Operand<TInt64> prefetchInputElements,
       Operand<TInt64> numParallelCalls, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelInterleaveDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParallelInterleaveDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
     opBuilder.addInput(cycleLength.asOutput());
@@ -107,7 +107,6 @@ public static ParallelInterleaveDataset create(Scope scope, Operand<? extends TT
     opBuilder.addInput(bufferOutputElements.asOutput());
     opBuilder.addInput(prefetchInputElements.asOutput());
     opBuilder.addInput(numParallelCalls.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelMapDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelMapDataset.java
index 8d3c1686b5f..e954f33b8ec 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelMapDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParallelMapDataset.java
@@ -75,11 +75,10 @@ private ParallelMapDataset(Operation operation) {
   public static ParallelMapDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> otherArguments, Operand<TInt64> numParallelCalls, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelMapDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParallelMapDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
     opBuilder.addInput(numParallelCalls.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParseExampleDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParseExampleDataset.java
index 6389e91a952..16163f215e3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParseExampleDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ParseExampleDataset.java
@@ -94,11 +94,10 @@ public static ParseExampleDataset create(Scope scope, Operand<? extends TType> i
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes,
       List<Class<? extends TType>> raggedValueTypes,
       List<Class<? extends TNumber>> raggedSplitTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseExampleDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParseExampleDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(numParallelCalls.asOutput());
     opBuilder.addInputList(Operands.asOutputs(denseDefaults));
-    opBuilder = scope.apply(opBuilder);
     String[] sparseKeysArray = new String[sparseKeys.size()];
     for (int i = 0 ; i < sparseKeysArray.length ; i++) {
       sparseKeysArray[i] = sparseKeys.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrefetchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrefetchDataset.java
index 92d74b4742a..e175f440778 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrefetchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrefetchDataset.java
@@ -70,10 +70,9 @@ private PrefetchDataset(Operation operation) {
   public static PrefetchDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> bufferSize, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PrefetchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PrefetchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(bufferSize.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrivateThreadPoolDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrivateThreadPoolDataset.java
index e5e387da993..73e293fa5f7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrivateThreadPoolDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrivateThreadPoolDataset.java
@@ -68,10 +68,9 @@ private PrivateThreadPoolDataset(Operation operation) {
   public static PrivateThreadPoolDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> numThreads, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PrivateThreadPoolDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PrivateThreadPoolDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(numThreads.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RandomDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RandomDataset.java
index ef1b7a72431..3d88d88c4e6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RandomDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RandomDataset.java
@@ -77,10 +77,9 @@ private RandomDataset(Operation operation) {
   )
   public static RandomDataset create(Scope scope, Operand<TInt64> seed, Operand<TInt64> seed2,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomDataset");
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(seed2.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RangeDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RangeDataset.java
index bca448ecda1..ae0e82544c3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RangeDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RangeDataset.java
@@ -68,11 +68,10 @@ private RangeDataset(Operation operation) {
   )
   public static RangeDataset create(Scope scope, Operand<TInt64> start, Operand<TInt64> stop,
       Operand<TInt64> step, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RangeDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RangeDataset");
     opBuilder.addInput(start.asOutput());
     opBuilder.addInput(stop.asOutput());
     opBuilder.addInput(step.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDatasetV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDatasetV2.java
index 2c50b6cf519..1028ca5a6f4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDatasetV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDatasetV2.java
@@ -73,11 +73,10 @@ private RebatchDatasetV2(Operation operation) {
   public static RebatchDatasetV2 create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> batchSizes, Operand<TBool> dropRemainder,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RebatchDatasetV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RebatchDatasetV2");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(batchSizes.asOutput());
     opBuilder.addInput(dropRemainder.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ReduceDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ReduceDataset.java
index 143ec183fee..1304c04223c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ReduceDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ReduceDataset.java
@@ -78,11 +78,10 @@ private ReduceDataset(Operation operation) {
   public static ReduceDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> initialState, Iterable<Operand<?>> otherArguments, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(initialState));
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RegisterDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RegisterDataset.java
index e389557f99f..d06a4615c20 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RegisterDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RegisterDataset.java
@@ -64,11 +64,10 @@ private RegisterDataset(Operation operation) {
   )
   public static RegisterDataset create(Scope scope, Operand<? extends TType> dataset,
       Operand<TString> address, Operand<TString> protocol, Long externalStatePolicy) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RegisterDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RegisterDataset");
     opBuilder.addInput(dataset.asOutput());
     opBuilder.addInput(address.asOutput());
     opBuilder.addInput(protocol.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("external_state_policy", externalStatePolicy);
     return new RegisterDataset(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RepeatDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RepeatDataset.java
index d569bdd267d..0aa7b1e0c9d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RepeatDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RepeatDataset.java
@@ -68,10 +68,9 @@ private RepeatDataset(Operation operation) {
   )
   public static RepeatDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> count, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RepeatDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RepeatDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(count.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SamplingDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SamplingDataset.java
index 550df76210e..af6c4f4bfaa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SamplingDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SamplingDataset.java
@@ -77,12 +77,11 @@ private SamplingDataset(Operation operation) {
   public static SamplingDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TFloat32> rate, Operand<TInt64> seed, Operand<TInt64> seed2,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SamplingDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SamplingDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(rate.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(seed2.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SaveDataset.java
index 74a20665508..c034b1bcde2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SaveDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SaveDataset.java
@@ -62,11 +62,10 @@ private SaveDataset(Operation operation) {
   public static SaveDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> path, Iterable<Operand<?>> shardFuncOtherArgs, ConcreteFunction shardFunc,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SaveDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SaveDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(path.asOutput());
     opBuilder.addInputList(Operands.asOutputs(shardFuncOtherArgs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("shard_func", shardFunc);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ScanDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ScanDataset.java
index ab71a2a7da3..23b1f1a213a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ScanDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ScanDataset.java
@@ -71,11 +71,10 @@ private ScanDataset(Operation operation) {
   public static ScanDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> initialState, Iterable<Operand<?>> otherArguments, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScanDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScanDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(initialState));
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SerializeIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SerializeIterator.java
index 4d850e18e3a..23849f93b36 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SerializeIterator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SerializeIterator.java
@@ -61,9 +61,8 @@ private SerializeIterator(Operation operation) {
   )
   public static SerializeIterator create(Scope scope, Operand<? extends TType> resourceHandle,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SerializeIterator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SerializeIterator");
     opBuilder.addInput(resourceHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.externalStatePolicy != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SetStatsAggregatorDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SetStatsAggregatorDataset.java
index fd935d5862f..96f5356c838 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SetStatsAggregatorDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SetStatsAggregatorDataset.java
@@ -71,12 +71,11 @@ public static SetStatsAggregatorDataset create(Scope scope, Operand<? extends TT
       Operand<? extends TType> statsAggregator, Operand<TString> tag,
       Operand<TString> counterPrefix, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetStatsAggregatorDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SetStatsAggregatorDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(statsAggregator.asOutput());
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(counterPrefix.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShardDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShardDataset.java
index 1609721dbde..981cbe60944 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShardDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShardDataset.java
@@ -70,11 +70,10 @@ private ShardDataset(Operation operation) {
   public static ShardDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> numShards, Operand<TInt64> index, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShardDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ShardDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(numShards.asOutput());
     opBuilder.addInput(index.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleAndRepeatDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleAndRepeatDataset.java
index c57edd1bb10..72178a21672 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleAndRepeatDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleAndRepeatDataset.java
@@ -74,14 +74,13 @@ public static ShuffleAndRepeatDataset create(Scope scope, Operand<? extends TTyp
       Operand<TInt64> bufferSize, Operand<TInt64> seed, Operand<TInt64> seed2,
       Operand<TInt64> count, Operand<? extends TType> seedGenerator,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShuffleAndRepeatDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ShuffleAndRepeatDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(bufferSize.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(seed2.asOutput());
     opBuilder.addInput(count.asOutput());
     opBuilder.addInput(seedGenerator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleDataset.java
index 4bdbd0abc2c..369f892c0da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleDataset.java
@@ -73,13 +73,12 @@ public static ShuffleDataset create(Scope scope, Operand<? extends TType> inputD
       Operand<TInt64> bufferSize, Operand<TInt64> seed, Operand<TInt64> seed2,
       Operand<? extends TType> seedGenerator, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShuffleDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ShuffleDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(bufferSize.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(seed2.asOutput());
     opBuilder.addInput(seedGenerator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SkipDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SkipDataset.java
index 799fd924e15..5b219586c7e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SkipDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SkipDataset.java
@@ -68,10 +68,9 @@ private SkipDataset(Operation operation) {
   )
   public static SkipDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> count, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SkipDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SkipDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(count.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SleepDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SleepDataset.java
index 74992fd71fa..86bc79865a8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SleepDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SleepDataset.java
@@ -68,10 +68,9 @@ private SleepDataset(Operation operation) {
   public static SleepDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> sleepMicroseconds, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SleepDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SleepDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(sleepMicroseconds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SlidingWindowDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SlidingWindowDataset.java
index 4a5d1629816..6c9b47b7a24 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SlidingWindowDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SlidingWindowDataset.java
@@ -73,12 +73,11 @@ private SlidingWindowDataset(Operation operation) {
   public static SlidingWindowDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> windowSize, Operand<TInt64> windowShift, Operand<TInt64> windowStride,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SlidingWindowDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SlidingWindowDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(windowSize.asOutput());
     opBuilder.addInput(windowShift.asOutput());
     opBuilder.addInput(windowStride.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDataset.java
index a1cbcd27635..071a1d9ff0a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDataset.java
@@ -80,12 +80,11 @@ public static SnapshotDataset create(Scope scope, Operand<? extends TType> input
       Iterable<Operand<?>> shardFuncOtherArgs, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, ConcreteFunction readerFunc, ConcreteFunction shardFunc,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SnapshotDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SnapshotDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(path.asOutput());
     opBuilder.addInputList(Operands.asOutputs(readerFuncOtherArgs));
     opBuilder.addInputList(Operands.asOutputs(shardFuncOtherArgs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDatasetReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDatasetReader.java
new file mode 100644
index 00000000000..aa33c499b50
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDatasetReader.java
@@ -0,0 +1,135 @@
+/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================*/
+
+// This class has been generated, DO NOT EDIT!
+
+package org.tensorflow.op.data;
+
+import java.util.List;
+import org.tensorflow.Operand;
+import org.tensorflow.Operation;
+import org.tensorflow.OperationBuilder;
+import org.tensorflow.Output;
+import org.tensorflow.ndarray.Shape;
+import org.tensorflow.op.Operands;
+import org.tensorflow.op.RawOp;
+import org.tensorflow.op.Scope;
+import org.tensorflow.op.annotation.Endpoint;
+import org.tensorflow.types.TInt64;
+import org.tensorflow.types.TString;
+import org.tensorflow.types.family.TType;
+
+/**
+ * The SnapshotDatasetReader operation
+ */
+public final class SnapshotDatasetReader extends RawOp implements Operand<TType> {
+  /**
+   * The name of this op, as known by TensorFlow core engine
+   */
+  public static final String OP_NAME = "SnapshotDatasetReader";
+
+  private Output<? extends TType> handle;
+
+  @SuppressWarnings("unchecked")
+  private SnapshotDatasetReader(Operation operation) {
+    super(operation);
+    int outputIdx = 0;
+    handle = operation.output(outputIdx++);
+  }
+
+  /**
+   * Factory method to create a class wrapping a new SnapshotDatasetReader operation.
+   *
+   * @param scope current scope
+   * @param shardDir the shardDir value
+   * @param startIndex the startIndex value
+   * @param outputTypes the value of the outputTypes property
+   * @param outputShapes the value of the outputShapes property
+   * @param version the value of the version property
+   * @param options carries optional attribute values
+   * @return a new instance of SnapshotDatasetReader
+   */
+  @Endpoint(
+      describeByClass = true
+  )
+  public static SnapshotDatasetReader create(Scope scope, Operand<TString> shardDir,
+      Operand<TInt64> startIndex, List<Class<? extends TType>> outputTypes,
+      List<Shape> outputShapes, Long version, Options... options) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SnapshotDatasetReader");
+    opBuilder.addInput(shardDir.asOutput());
+    opBuilder.addInput(startIndex.asOutput());
+    opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
+    Shape[] outputShapesArray = new Shape[outputShapes.size()];
+    for (int i = 0 ; i < outputShapesArray.length ; i++) {
+      outputShapesArray[i] = outputShapes.get(i);
+    }
+    opBuilder.setAttr("output_shapes", outputShapesArray);
+    opBuilder.setAttr("version", version);
+    if (options != null) {
+      for (Options opts : options) {
+        if (opts.compression != null) {
+          opBuilder.setAttr("compression", opts.compression);
+        }
+      }
+    }
+    return new SnapshotDatasetReader(opBuilder.build());
+  }
+
+  /**
+   * Sets the compression option.
+   *
+   * @param compression the compression option
+   * @return this Options instance.
+   */
+  public static Options compression(String compression) {
+    return new Options().compression(compression);
+  }
+
+  /**
+   * Gets handle.
+   *
+   * @return handle.
+   */
+  public Output<? extends TType> handle() {
+    return handle;
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public Output<TType> asOutput() {
+    return (Output<TType>) handle;
+  }
+
+  /**
+   * Optional attributes for {@link org.tensorflow.op.data.SnapshotDatasetReader}
+   */
+  public static class Options {
+    private String compression;
+
+    private Options() {
+    }
+
+    /**
+     * Sets the compression option.
+     *
+     * @param compression the compression option
+     * @return this Options instance.
+     */
+    public Options compression(String compression) {
+      this.compression = compression;
+      return this;
+    }
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotNestedDatasetReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotNestedDatasetReader.java
new file mode 100644
index 00000000000..db9712a9d14
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotNestedDatasetReader.java
@@ -0,0 +1,90 @@
+/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================*/
+
+// This class has been generated, DO NOT EDIT!
+
+package org.tensorflow.op.data;
+
+import java.util.List;
+import org.tensorflow.Operand;
+import org.tensorflow.Operation;
+import org.tensorflow.OperationBuilder;
+import org.tensorflow.Output;
+import org.tensorflow.ndarray.Shape;
+import org.tensorflow.op.Operands;
+import org.tensorflow.op.RawOp;
+import org.tensorflow.op.Scope;
+import org.tensorflow.op.annotation.Endpoint;
+import org.tensorflow.types.family.TType;
+
+/**
+ * The SnapshotNestedDatasetReader operation
+ */
+public final class SnapshotNestedDatasetReader extends RawOp implements Operand<TType> {
+  /**
+   * The name of this op, as known by TensorFlow core engine
+   */
+  public static final String OP_NAME = "SnapshotNestedDatasetReader";
+
+  private Output<? extends TType> handle;
+
+  @SuppressWarnings("unchecked")
+  private SnapshotNestedDatasetReader(Operation operation) {
+    super(operation);
+    int outputIdx = 0;
+    handle = operation.output(outputIdx++);
+  }
+
+  /**
+   * Factory method to create a class wrapping a new SnapshotNestedDatasetReader operation.
+   *
+   * @param scope current scope
+   * @param inputs the inputs value
+   * @param outputTypes the value of the outputTypes property
+   * @param outputShapes the value of the outputShapes property
+   * @return a new instance of SnapshotNestedDatasetReader
+   */
+  @Endpoint(
+      describeByClass = true
+  )
+  public static SnapshotNestedDatasetReader create(Scope scope,
+      Iterable<Operand<? extends TType>> inputs, List<Class<? extends TType>> outputTypes,
+      List<Shape> outputShapes) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SnapshotNestedDatasetReader");
+    opBuilder.addInputList(Operands.asOutputs(inputs));
+    opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
+    Shape[] outputShapesArray = new Shape[outputShapes.size()];
+    for (int i = 0 ; i < outputShapesArray.length ; i++) {
+      outputShapesArray[i] = outputShapes.get(i);
+    }
+    opBuilder.setAttr("output_shapes", outputShapesArray);
+    return new SnapshotNestedDatasetReader(opBuilder.build());
+  }
+
+  /**
+   * Gets handle.
+   *
+   * @return handle.
+   */
+  public Output<? extends TType> handle() {
+    return handle;
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public Output<TType> asOutput() {
+    return (Output<TType>) handle;
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java
index 6de2eb40539..f9040abd1c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java
@@ -63,11 +63,10 @@ private SparseTensorSliceDataset(Operation operation) {
   )
   public static SparseTensorSliceDataset create(Scope scope, Operand<TInt64> indices,
       Operand<? extends TType> values, Operand<TInt64> denseShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseTensorSliceDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseTensorSliceDataset");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(denseShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseTensorSliceDataset(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SqlDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SqlDataset.java
index 5fd6a3d5784..2b4bb39e58e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SqlDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SqlDataset.java
@@ -69,11 +69,10 @@ private SqlDataset(Operation operation) {
   public static SqlDataset create(Scope scope, Operand<TString> driverName,
       Operand<TString> dataSourceName, Operand<TString> query,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SqlDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SqlDataset");
     opBuilder.addInput(driverName.asOutput());
     opBuilder.addInput(dataSourceName.asOutput());
     opBuilder.addInput(query.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
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 99c227869fc..0040b1848f8 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
@@ -55,8 +55,7 @@ private StatsAggregatorHandle(Operation operation) {
       describeByClass = true
   )
   public static StatsAggregatorHandle create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorHandle"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatsAggregatorHandle");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorSetSummaryWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorSetSummaryWriter.java
index aa3e56da61b..b97c1dd7100 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorSetSummaryWriter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorSetSummaryWriter.java
@@ -51,10 +51,9 @@ private StatsAggregatorSetSummaryWriter(Operation operation) {
   )
   public static StatsAggregatorSetSummaryWriter create(Scope scope,
       Operand<? extends TType> statsAggregator, Operand<? extends TType> summary) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorSetSummaryWriter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatsAggregatorSetSummaryWriter");
     opBuilder.addInput(statsAggregator.asOutput());
     opBuilder.addInput(summary.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatsAggregatorSetSummaryWriter(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeDataset.java
index c5fe31e28d9..788dbd06df5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeDataset.java
@@ -69,10 +69,9 @@ private TakeDataset(Operation operation) {
   )
   public static TakeDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> count, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TakeDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TakeDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(count.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeWhileDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeWhileDataset.java
index 5f916997113..1e680f60071 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeWhileDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeWhileDataset.java
@@ -76,10 +76,9 @@ private TakeWhileDataset(Operation operation) {
   public static TakeWhileDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> otherArguments, ConcreteFunction predicate,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TakeWhileDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TakeWhileDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("predicate", predicate);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorDataset.java
index a089e8e1be5..b11802e35ba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorDataset.java
@@ -64,9 +64,8 @@ private TensorDataset(Operation operation) {
   )
   public static TensorDataset create(Scope scope, Iterable<Operand<?>> components,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorDataset");
     opBuilder.addInputList(Operands.asOutputs(components));
-    opBuilder = scope.apply(opBuilder);
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
       outputShapesArray[i] = outputShapes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorSliceDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorSliceDataset.java
index ea02e5d6918..420694899a5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorSliceDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorSliceDataset.java
@@ -64,9 +64,8 @@ private TensorSliceDataset(Operation operation) {
   )
   public static TensorSliceDataset create(Scope scope, Iterable<Operand<?>> components,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorSliceDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorSliceDataset");
     opBuilder.addInputList(Operands.asOutputs(components));
-    opBuilder = scope.apply(opBuilder);
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
       outputShapesArray[i] = outputShapes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TextLineDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TextLineDataset.java
index 45892e72242..b1076784e89 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TextLineDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TextLineDataset.java
@@ -66,11 +66,10 @@ private TextLineDataset(Operation operation) {
   )
   public static TextLineDataset create(Scope scope, Operand<TString> filenames,
       Operand<TString> compressionType, Operand<TInt64> bufferSize) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TextLineDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TextLineDataset");
     opBuilder.addInput(filenames.asOutput());
     opBuilder.addInput(compressionType.asOutput());
     opBuilder.addInput(bufferSize.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TextLineDataset(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TfRecordDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TfRecordDataset.java
index 3ee07058682..431e2a7db47 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TfRecordDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TfRecordDataset.java
@@ -67,11 +67,10 @@ private TfRecordDataset(Operation operation) {
   )
   public static TfRecordDataset create(Scope scope, Operand<TString> filenames,
       Operand<TString> compressionType, Operand<TInt64> bufferSize) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TfRecordDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TfRecordDataset");
     opBuilder.addInput(filenames.asOutput());
     opBuilder.addInput(compressionType.asOutput());
     opBuilder.addInput(bufferSize.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TfRecordDataset(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolDataset.java
index 17a7c0c9065..85aec5ab605 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolDataset.java
@@ -67,10 +67,9 @@ private ThreadPoolDataset(Operation operation) {
   public static ThreadPoolDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<? extends TType> threadPool, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ThreadPoolDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ThreadPoolDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(threadPool.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
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 5c12acd811a..2ac0bcfd414 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
@@ -60,8 +60,7 @@ private ThreadPoolHandle(Operation operation) {
   )
   public static ThreadPoolHandle create(Scope scope, Long numThreads, String displayName,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ThreadPoolHandle"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ThreadPoolHandle");
     opBuilder.setAttr("num_threads", numThreads);
     opBuilder.setAttr("display_name", displayName);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnbatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnbatchDataset.java
index 2fd64618e8e..6d22e02d68f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnbatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnbatchDataset.java
@@ -65,9 +65,8 @@ private UnbatchDataset(Operation operation) {
   )
   public static UnbatchDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnbatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnbatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UncompressElement.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UncompressElement.java
index 344915555c9..168ea7488f7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UncompressElement.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UncompressElement.java
@@ -65,9 +65,8 @@ private UncompressElement(Operation operation) {
   )
   public static UncompressElement create(Scope scope, Operand<? extends TType> compressed,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UncompressElement"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UncompressElement");
     opBuilder.addInput(compressed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UniqueDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UniqueDataset.java
index 6938c786469..f8919551a23 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UniqueDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UniqueDataset.java
@@ -65,9 +65,8 @@ private UniqueDataset(Operation operation) {
   )
   public static UniqueDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UniqueDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UniqueDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnwrapDatasetVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnwrapDatasetVariant.java
index 2bbc602b5fc..12ffdcb7f9d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnwrapDatasetVariant.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnwrapDatasetVariant.java
@@ -59,9 +59,8 @@ private UnwrapDatasetVariant(Operation operation) {
       describeByClass = true
   )
   public static UnwrapDatasetVariant create(Scope scope, Operand<? extends TType> inputHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnwrapDatasetVariant"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnwrapDatasetVariant");
     opBuilder.addInput(inputHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new UnwrapDatasetVariant(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WindowDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WindowDataset.java
index 3988ddcd99d..eefcbf8970c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WindowDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WindowDataset.java
@@ -114,13 +114,12 @@ public static WindowDataset create(Scope scope, Operand<? extends TType> inputDa
       Operand<TInt64> sizeOutput, Operand<TInt64> shift, Operand<TInt64> stride,
       Operand<TBool> dropRemainder, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WindowDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WindowDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(shift.asOutput());
     opBuilder.addInput(stride.asOutput());
     opBuilder.addInput(dropRemainder.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WrapDatasetVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WrapDatasetVariant.java
index aec61c37b21..dcc6efc6332 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WrapDatasetVariant.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WrapDatasetVariant.java
@@ -59,9 +59,8 @@ private WrapDatasetVariant(Operation operation) {
       describeByClass = true
   )
   public static WrapDatasetVariant create(Scope scope, Operand<? extends TType> inputHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WrapDatasetVariant"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WrapDatasetVariant");
     opBuilder.addInput(inputHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new WrapDatasetVariant(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ZipDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ZipDataset.java
index a07a8a14ede..46a341e0d33 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ZipDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ZipDataset.java
@@ -69,9 +69,8 @@ private ZipDataset(Operation operation) {
   )
   public static ZipDataset create(Scope scope, Iterable<Operand<? extends TType>> inputDatasets,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ZipDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ZipDataset");
     opBuilder.addInputList(Operands.asOutputs(inputDatasets));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertNextDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertNextDataset.java
index 56513038149..1a7829d5102 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertNextDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertNextDataset.java
@@ -64,10 +64,9 @@ private AssertNextDataset(Operation operation) {
   public static AssertNextDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> transformations, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssertNextDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AssertNextDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(transformations.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AutoShardDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AutoShardDataset.java
index 4375aeda74d..dfbe0d4e060 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AutoShardDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AutoShardDataset.java
@@ -72,11 +72,10 @@ private AutoShardDataset(Operation operation) {
   public static AutoShardDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> numWorkers, Operand<TInt64> index, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AutoShardDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AutoShardDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(numWorkers.asOutput());
     opBuilder.addInput(index.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/BytesProducedStatsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/BytesProducedStatsDataset.java
index 5f6a0ace7c6..7c77fc6e331 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/BytesProducedStatsDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/BytesProducedStatsDataset.java
@@ -63,10 +63,9 @@ private BytesProducedStatsDataset(Operation operation) {
   )
   public static BytesProducedStatsDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> tag, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BytesProducedStatsDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BytesProducedStatsDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(tag.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CSVDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CSVDataset.java
index 9a3ee0dfa20..6a0450a2e61 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CSVDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CSVDataset.java
@@ -73,7 +73,7 @@ public static CSVDataset create(Scope scope, Operand<TString> filenames,
       Operand<TString> compressionType, Operand<TInt64> bufferSize, Operand<TBool> header,
       Operand<TString> fieldDelim, Operand<TBool> useQuoteDelim, Operand<TString> naValue,
       Operand<TInt64> selectCols, Iterable<Operand<?>> recordDefaults, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSVDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CSVDataset");
     opBuilder.addInput(filenames.asOutput());
     opBuilder.addInput(compressionType.asOutput());
     opBuilder.addInput(bufferSize.asOutput());
@@ -83,7 +83,6 @@ public static CSVDataset create(Scope scope, Operand<TString> filenames,
     opBuilder.addInput(naValue.asOutput());
     opBuilder.addInput(selectCols.asOutput());
     opBuilder.addInputList(Operands.asOutputs(recordDefaults));
-    opBuilder = scope.apply(opBuilder);
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
       outputShapesArray[i] = outputShapes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ChooseFastestDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ChooseFastestDataset.java
index 0b2f583aab2..53549e4ef72 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ChooseFastestDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ChooseFastestDataset.java
@@ -63,9 +63,8 @@ private ChooseFastestDataset(Operation operation) {
   public static ChooseFastestDataset create(Scope scope,
       Iterable<Operand<? extends TType>> inputDatasets, Long numExperiments,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ChooseFastestDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ChooseFastestDataset");
     opBuilder.addInputList(Operands.asOutputs(inputDatasets));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_experiments", numExperiments);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetCardinality.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetCardinality.java
index 4d179b451bf..7efa5d34525 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetCardinality.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetCardinality.java
@@ -56,9 +56,8 @@ private DatasetCardinality(Operation operation) {
       describeByClass = true
   )
   public static DatasetCardinality create(Scope scope, Operand<? extends TType> inputDataset) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetCardinality"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DatasetCardinality");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DatasetCardinality(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetToTFRecord.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetToTFRecord.java
index cf25191b693..5a82c0ece34 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetToTFRecord.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetToTFRecord.java
@@ -54,11 +54,10 @@ private DatasetToTFRecord(Operation operation) {
   )
   public static DatasetToTFRecord create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> filename, Operand<TString> compressionType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetToTFRecord"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DatasetToTFRecord");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(filename.asOutput());
     opBuilder.addInput(compressionType.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DatasetToTFRecord(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DenseToSparseBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DenseToSparseBatchDataset.java
index dcffd82c925..3cf5ef82177 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DenseToSparseBatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DenseToSparseBatchDataset.java
@@ -68,11 +68,10 @@ private DenseToSparseBatchDataset(Operation operation) {
   public static DenseToSparseBatchDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> batchSize, Operand<TInt64> rowShape, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToSparseBatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DenseToSparseBatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(batchSize.asOutput());
     opBuilder.addInput(rowShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DirectedInterleaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DirectedInterleaveDataset.java
index cf572d6c552..ac6de0d5dc6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DirectedInterleaveDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DirectedInterleaveDataset.java
@@ -66,10 +66,9 @@ public static DirectedInterleaveDataset create(Scope scope,
       Operand<? extends TType> selectorInputDataset,
       Iterable<Operand<? extends TType>> dataInputDatasets,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DirectedInterleaveDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DirectedInterleaveDataset");
     opBuilder.addInput(selectorInputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(dataInputDatasets));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/GroupByReducerDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/GroupByReducerDataset.java
index 1b2c46e2de1..7529ad3c740 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/GroupByReducerDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/GroupByReducerDataset.java
@@ -82,13 +82,12 @@ public static GroupByReducerDataset create(Scope scope, Operand<? extends TType>
       Iterable<Operand<?>> finalizeFuncOtherArguments, ConcreteFunction keyFunc,
       ConcreteFunction initFunc, ConcreteFunction reduceFunc, ConcreteFunction finalizeFunc,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GroupByReducerDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GroupByReducerDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(keyFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(initFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(reduceFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(finalizeFuncOtherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("key_func", keyFunc);
     opBuilder.setAttr("init_func", initFunc);
     opBuilder.setAttr("reduce_func", reduceFunc);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/GroupByWindowDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/GroupByWindowDataset.java
index 043b87f399b..167a637ae37 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/GroupByWindowDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/GroupByWindowDataset.java
@@ -73,12 +73,11 @@ public static GroupByWindowDataset create(Scope scope, Operand<? extends TType>
       Iterable<Operand<?>> windowSizeFuncOtherArguments, ConcreteFunction keyFunc,
       ConcreteFunction reduceFunc, ConcreteFunction windowSizeFunc,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GroupByWindowDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GroupByWindowDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(keyFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(reduceFuncOtherArguments));
     opBuilder.addInputList(Operands.asOutputs(windowSizeFuncOtherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("key_func", keyFunc);
     opBuilder.setAttr("reduce_func", reduceFunc);
     opBuilder.setAttr("window_size_func", windowSizeFunc);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IgnoreErrorsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IgnoreErrorsDataset.java
index 0804fea6bc7..f53e17499bc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IgnoreErrorsDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IgnoreErrorsDataset.java
@@ -62,9 +62,8 @@ private IgnoreErrorsDataset(Operation operation) {
   )
   public static IgnoreErrorsDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IgnoreErrorsDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IgnoreErrorsDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IteratorGetDevice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IteratorGetDevice.java
index b05b4a59b08..3058f0435f2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IteratorGetDevice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IteratorGetDevice.java
@@ -55,9 +55,8 @@ private IteratorGetDevice(Operation operation) {
       describeByClass = true
   )
   public static IteratorGetDevice create(Scope scope, Operand<? extends TType> resource) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetDevice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IteratorGetDevice");
     opBuilder.addInput(resource.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IteratorGetDevice(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LatencyStatsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LatencyStatsDataset.java
index 8fd36731572..9f16e3a897e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LatencyStatsDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LatencyStatsDataset.java
@@ -63,10 +63,9 @@ private LatencyStatsDataset(Operation operation) {
   )
   public static LatencyStatsDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TString> tag, List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LatencyStatsDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LatencyStatsDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(tag.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LmdbDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LmdbDataset.java
index e53ab9a5387..70be4842be2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LmdbDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LmdbDataset.java
@@ -62,9 +62,8 @@ private LmdbDataset(Operation operation) {
   )
   public static LmdbDataset create(Scope scope, Operand<TString> filenames,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LmdbDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LmdbDataset");
     opBuilder.addInput(filenames.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MapAndBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MapAndBatchDataset.java
index 3a86ebd3ed3..558a9dcfc73 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MapAndBatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MapAndBatchDataset.java
@@ -82,13 +82,12 @@ public static MapAndBatchDataset create(Scope scope, Operand<? extends TType> in
       Iterable<Operand<?>> otherArguments, Operand<TInt64> batchSize,
       Operand<TInt64> numParallelCalls, Operand<TBool> dropRemainder, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapAndBatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapAndBatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
     opBuilder.addInput(batchSize.asOutput());
     opBuilder.addInput(numParallelCalls.asOutput());
     opBuilder.addInput(dropRemainder.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MapDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MapDataset.java
index efab3bb9ef3..0e62ebd5e11 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MapDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MapDataset.java
@@ -66,10 +66,9 @@ private MapDataset(Operation operation) {
   public static MapDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> otherArguments, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MapDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MatchingFilesDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MatchingFilesDataset.java
index ce807c2f225..ab878c00539 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MatchingFilesDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MatchingFilesDataset.java
@@ -56,9 +56,8 @@ private MatchingFilesDataset(Operation operation) {
       describeByClass = true
   )
   public static MatchingFilesDataset create(Scope scope, Operand<TString> patterns) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatchingFilesDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatchingFilesDataset");
     opBuilder.addInput(patterns.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MatchingFilesDataset(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MaxIntraOpParallelismDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MaxIntraOpParallelismDataset.java
index 1cbbb19b216..9cb10df0fa7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MaxIntraOpParallelismDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MaxIntraOpParallelismDataset.java
@@ -64,10 +64,9 @@ private MaxIntraOpParallelismDataset(Operation operation) {
   public static MaxIntraOpParallelismDataset create(Scope scope,
       Operand<? extends TType> inputDataset, Operand<TInt64> maxIntraOpParallelism,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxIntraOpParallelismDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxIntraOpParallelismDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(maxIntraOpParallelism.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/NonSerializableDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/NonSerializableDataset.java
index 50d17ad20e6..3f181e88877 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/NonSerializableDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/NonSerializableDataset.java
@@ -61,9 +61,8 @@ private NonSerializableDataset(Operation operation) {
   )
   public static NonSerializableDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonSerializableDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NonSerializableDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParallelInterleaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParallelInterleaveDataset.java
index 0aa546f2f9c..7d12f7468dc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParallelInterleaveDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParallelInterleaveDataset.java
@@ -82,7 +82,7 @@ public static ParallelInterleaveDataset create(Scope scope, Operand<? extends TT
       Operand<TBool> sloppy, Operand<TInt64> bufferOutputElements,
       Operand<TInt64> prefetchInputElements, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelInterleaveDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParallelInterleaveDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
     opBuilder.addInput(cycleLength.asOutput());
@@ -90,7 +90,6 @@ public static ParallelInterleaveDataset create(Scope scope, Operand<? extends TT
     opBuilder.addInput(sloppy.asOutput());
     opBuilder.addInput(bufferOutputElements.asOutput());
     opBuilder.addInput(prefetchInputElements.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParseExampleDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParseExampleDataset.java
index 6a569cb0c68..07382c698c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParseExampleDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParseExampleDataset.java
@@ -84,11 +84,10 @@ public static ParseExampleDataset create(Scope scope, Operand<? extends TType> i
       Operand<TInt64> numParallelCalls, Iterable<Operand<?>> denseDefaults, List<String> sparseKeys,
       List<String> denseKeys, List<Class<? extends TType>> sparseTypes, List<Shape> denseShapes,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseExampleDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParseExampleDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(numParallelCalls.asOutput());
     opBuilder.addInputList(Operands.asOutputs(denseDefaults));
-    opBuilder = scope.apply(opBuilder);
     String[] sparseKeysArray = new String[sparseKeys.size()];
     for (int i = 0 ; i < sparseKeysArray.length ; i++) {
       sparseKeysArray[i] = sparseKeys.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/PrivateThreadPoolDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/PrivateThreadPoolDataset.java
index 8ac3d4955e2..5a00063f195 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/PrivateThreadPoolDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/PrivateThreadPoolDataset.java
@@ -64,10 +64,9 @@ private PrivateThreadPoolDataset(Operation operation) {
   public static PrivateThreadPoolDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> numThreads, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PrivateThreadPoolDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PrivateThreadPoolDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(numThreads.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RandomDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RandomDataset.java
index c2c9cf73c4d..aa9519d9f7a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RandomDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RandomDataset.java
@@ -65,10 +65,9 @@ private RandomDataset(Operation operation) {
   )
   public static RandomDataset create(Scope scope, Operand<TInt64> seed, Operand<TInt64> seed2,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomDataset");
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(seed2.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RebatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RebatchDataset.java
index 73856b0d475..b6916632de5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RebatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RebatchDataset.java
@@ -69,10 +69,9 @@ private RebatchDataset(Operation operation) {
   public static RebatchDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> numReplicas, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RebatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RebatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(numReplicas.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ScanDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ScanDataset.java
index e60d6024026..83d1e9d00ff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ScanDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ScanDataset.java
@@ -67,11 +67,10 @@ private ScanDataset(Operation operation) {
   public static ScanDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> initialState, Iterable<Operand<?>> otherArguments, ConcreteFunction f,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScanDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScanDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(initialState));
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("f", f);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SetStatsAggregatorDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SetStatsAggregatorDataset.java
index ff9bad603f6..48cb4200150 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SetStatsAggregatorDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SetStatsAggregatorDataset.java
@@ -67,12 +67,11 @@ public static SetStatsAggregatorDataset create(Scope scope, Operand<? extends TT
       Operand<? extends TType> statsAggregator, Operand<TString> tag,
       Operand<TString> counterPrefix, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetStatsAggregatorDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SetStatsAggregatorDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(statsAggregator.asOutput());
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(counterPrefix.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SleepDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SleepDataset.java
index 8e96f63923f..f491ee77fa1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SleepDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SleepDataset.java
@@ -64,10 +64,9 @@ private SleepDataset(Operation operation) {
   public static SleepDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> sleepMicroseconds, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SleepDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SleepDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(sleepMicroseconds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SlidingWindowDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SlidingWindowDataset.java
index b81ae5016df..78d282bf214 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SlidingWindowDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SlidingWindowDataset.java
@@ -69,12 +69,11 @@ private SlidingWindowDataset(Operation operation) {
   public static SlidingWindowDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<TInt64> windowSize, Operand<TInt64> windowShift, Operand<TInt64> windowStride,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SlidingWindowDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SlidingWindowDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(windowSize.asOutput());
     opBuilder.addInput(windowShift.asOutput());
     opBuilder.addInput(windowStride.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SqlDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SqlDataset.java
index fd566c63733..e5e46b1bdf3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SqlDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SqlDataset.java
@@ -65,11 +65,10 @@ private SqlDataset(Operation operation) {
   public static SqlDataset create(Scope scope, Operand<TString> driverName,
       Operand<TString> dataSourceName, Operand<TString> query,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SqlDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SqlDataset");
     opBuilder.addInput(driverName.asOutput());
     opBuilder.addInput(dataSourceName.asOutput());
     opBuilder.addInput(query.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorHandle.java
index 4f1ea92e22d..c39b34e4b66 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorHandle.java
@@ -55,8 +55,7 @@ private StatsAggregatorHandle(Operation operation) {
       describeByClass = true
   )
   public static StatsAggregatorHandle create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorHandle"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatsAggregatorHandle");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSummary.java
index bf7250b438b..cd3b21e170d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSummary.java
@@ -55,9 +55,8 @@ private StatsAggregatorSummary(Operation operation) {
       describeByClass = true
   )
   public static StatsAggregatorSummary create(Scope scope, Operand<? extends TType> iterator) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatsAggregatorSummary");
     opBuilder.addInput(iterator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatsAggregatorSummary(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/TakeWhileDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/TakeWhileDataset.java
index 9f283a7eb1f..b4390229eb2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/TakeWhileDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/TakeWhileDataset.java
@@ -72,10 +72,9 @@ private TakeWhileDataset(Operation operation) {
   public static TakeWhileDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Iterable<Operand<?>> otherArguments, ConcreteFunction predicate,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TakeWhileDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TakeWhileDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInputList(Operands.asOutputs(otherArguments));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("predicate", predicate);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolDataset.java
index 6fa3410940d..467f53a61af 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolDataset.java
@@ -63,10 +63,9 @@ private ThreadPoolDataset(Operation operation) {
   public static ThreadPoolDataset create(Scope scope, Operand<? extends TType> inputDataset,
       Operand<? extends TType> threadPool, List<Class<? extends TType>> outputTypes,
       List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ThreadPoolDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ThreadPoolDataset");
     opBuilder.addInput(inputDataset.asOutput());
     opBuilder.addInput(threadPool.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
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 e117ad8e4f1..1635a481604 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
@@ -60,8 +60,7 @@ private ThreadPoolHandle(Operation operation) {
   )
   public static ThreadPoolHandle create(Scope scope, Long numThreads, String displayName,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ThreadPoolHandle"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ThreadPoolHandle");
     opBuilder.setAttr("num_threads", numThreads);
     opBuilder.setAttr("display_name", displayName);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UnbatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UnbatchDataset.java
index d557cc5184e..dfd9dbbc8d9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UnbatchDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UnbatchDataset.java
@@ -61,9 +61,8 @@ private UnbatchDataset(Operation operation) {
   )
   public static UnbatchDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnbatchDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnbatchDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UniqueDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UniqueDataset.java
index a722cbf820d..224d8c5758b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UniqueDataset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UniqueDataset.java
@@ -61,9 +61,8 @@ private UniqueDataset(Operation operation) {
   )
   public static UniqueDataset create(Scope scope, Operand<? extends TType> inputDataset,
       List<Class<? extends TType>> outputTypes, List<Shape> outputShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UniqueDataset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UniqueDataset");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes));
     Shape[] outputShapesArray = new Shape[outputShapes.size()];
     for (int i = 0 ; i < outputShapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/CheckNumerics.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/CheckNumerics.java
index 72fe63038f2..48fb6f1a702 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/CheckNumerics.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/CheckNumerics.java
@@ -63,9 +63,8 @@ private CheckNumerics(Operation operation) {
   )
   public static <T extends TNumber> CheckNumerics<T> create(Scope scope, Operand<T> tensor,
       String message) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CheckNumerics"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CheckNumerics");
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("message", message);
     return new CheckNumerics<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientIdentity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientIdentity.java
index 43f60d63d72..1038acbc9f3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientIdentity.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientIdentity.java
@@ -60,9 +60,8 @@ private DebugGradientIdentity(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> DebugGradientIdentity<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugGradientIdentity"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DebugGradientIdentity");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DebugGradientIdentity<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientRefIdentity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientRefIdentity.java
index 7ebca44b76e..b80cfd3951f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientRefIdentity.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientRefIdentity.java
@@ -61,9 +61,8 @@ private DebugGradientRefIdentity(Operation operation) {
   )
   public static <T extends TType> DebugGradientRefIdentity<T> create(Scope scope,
       Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugGradientRefIdentity"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DebugGradientRefIdentity");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DebugGradientRefIdentity<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugIdentity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugIdentity.java
index cdba78a556c..066e18c068e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugIdentity.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugIdentity.java
@@ -69,9 +69,8 @@ private DebugIdentity(Operation operation) {
   )
   public static <T extends TType> DebugIdentity<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugIdentity"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DebugIdentity");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.tfdbgContextId != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java
index a087e1fc778..0ebdb1005cd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java
@@ -60,9 +60,8 @@ private DebugNanCount(Operation operation) {
   )
   public static DebugNanCount create(Scope scope, Operand<? extends TType> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugNanCount"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DebugNanCount");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.deviceName != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java
index 3a3fed5025f..34ab74a640f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java
@@ -66,9 +66,8 @@ private DebugNumericsSummary(Operation operation) {
   )
   public static <U extends TNumber> DebugNumericsSummary<U> create(Scope scope,
       Operand<? extends TType> input, Class<U> outputDtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugNumericsSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DebugNumericsSummary");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_dtype", Operands.toDataType(outputDtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclAllReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclAllReduce.java
index 430784dfd45..72bc90a364c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclAllReduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclAllReduce.java
@@ -71,9 +71,8 @@ private NcclAllReduce(Operation operation) {
   )
   public static <T extends TNumber> NcclAllReduce<T> create(Scope scope, Operand<T> input,
       String reduction, Long numDevices, String sharedName) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclAllReduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NcclAllReduce");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("reduction", reduction);
     opBuilder.setAttr("num_devices", numDevices);
     opBuilder.setAttr("shared_name", sharedName);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclBroadcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclBroadcast.java
index da831716e48..0b34c24a7cc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclBroadcast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclBroadcast.java
@@ -66,9 +66,8 @@ private NcclBroadcast(Operation operation) {
   )
   public static <T extends TNumber> NcclBroadcast<T> create(Scope scope, Operand<T> input,
       Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclBroadcast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NcclBroadcast");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("shape", shape);
     return new NcclBroadcast<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclReduce.java
index a5b71f6c4dc..2204b1c0a72 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclReduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclReduce.java
@@ -66,9 +66,8 @@ private NcclReduce(Operation operation) {
   )
   public static <T extends TNumber> NcclReduce<T> create(Scope scope, Iterable<Operand<T>> input,
       String reduction) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclReduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NcclReduce");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("reduction", reduction);
     return new NcclReduce<>(opBuilder.build());
   }
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 7b0ef02045b..56c385236bf 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
@@ -75,9 +75,8 @@ private AsString(Operation operation) {
       describeByClass = true
   )
   public static AsString create(Scope scope, Operand<? extends TType> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AsString"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AsString");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.precision != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java
index 9106b875824..38e5860f94a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java
@@ -65,9 +65,8 @@ private Cast(Operation operation) {
   )
   public static <U extends TType> Cast<U> create(Scope scope, Operand<? extends TType> x,
       Class<U> DstT, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Cast");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("DstT", Operands.toDataType(DstT));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Complex.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Complex.java
index b56b0226d48..c7fdf63b966 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Complex.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Complex.java
@@ -78,10 +78,9 @@ private Complex(Operation operation) {
   )
   public static <U extends TType, T extends TNumber> Complex<U> create(Scope scope, Operand<T> real,
       Operand<T> imag, Class<U> Tout) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Complex"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Complex");
     opBuilder.addInput(real.asOutput());
     opBuilder.addInput(imag.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     return new Complex<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java
index d4f622e57df..3fac763c3eb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java
@@ -70,9 +70,8 @@ private ToBool(Operation operation) {
       describeByClass = true
   )
   public static ToBool create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToBool"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ToBool");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ToBool(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesAggregateStats.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesAggregateStats.java
index 82d322bafbf..80f669c35d3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesAggregateStats.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesAggregateStats.java
@@ -63,12 +63,11 @@ private BoostedTreesAggregateStats(Operation operation) {
   public static BoostedTreesAggregateStats create(Scope scope, Operand<TInt32> nodeIds,
       Operand<TFloat32> gradients, Operand<TFloat32> hessians, Operand<TInt32> feature,
       Long maxSplits, Long numBuckets) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesAggregateStats"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesAggregateStats");
     opBuilder.addInput(nodeIds.asOutput());
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(hessians.asOutput());
     opBuilder.addInput(feature.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("max_splits", maxSplits);
     opBuilder.setAttr("num_buckets", numBuckets);
     return new BoostedTreesAggregateStats(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesBucketize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesBucketize.java
index 1cf6f719ebb..b0a7183f681 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesBucketize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesBucketize.java
@@ -67,10 +67,9 @@ private BoostedTreesBucketize(Operation operation) {
   )
   public static BoostedTreesBucketize create(Scope scope, Iterable<Operand<TFloat32>> floatValues,
       Iterable<Operand<TFloat32>> bucketBoundaries) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesBucketize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesBucketize");
     opBuilder.addInputList(Operands.asOutputs(floatValues));
     opBuilder.addInputList(Operands.asOutputs(bucketBoundaries));
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesBucketize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplit.java
index f9b89d70e74..01eb21bba88 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplit.java
@@ -89,14 +89,13 @@ public static BoostedTreesCalculateBestFeatureSplit create(Scope scope,
       Operand<TInt32> nodeIdRange, Operand<TFloat32> statsSummary, Operand<TFloat32> l1,
       Operand<TFloat32> l2, Operand<TFloat32> treeComplexity, Operand<TFloat32> minNodeWeight,
       Long logitsDimension, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCalculateBestFeatureSplit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesCalculateBestFeatureSplit");
     opBuilder.addInput(nodeIdRange.asOutput());
     opBuilder.addInput(statsSummary.asOutput());
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(treeComplexity.asOutput());
     opBuilder.addInput(minNodeWeight.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("logits_dimension", logitsDimension);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplitV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplitV2.java
index 7dd9b267651..666b544d323 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplitV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplitV2.java
@@ -95,7 +95,7 @@ public static BoostedTreesCalculateBestFeatureSplitV2 create(Scope scope,
       Operand<TString> splitTypes, Operand<TInt32> candidateFeatureIds, Operand<TFloat32> l1,
       Operand<TFloat32> l2, Operand<TFloat32> treeComplexity, Operand<TFloat32> minNodeWeight,
       Long logitsDimension) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCalculateBestFeatureSplitV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesCalculateBestFeatureSplitV2");
     opBuilder.addInput(nodeIdRange.asOutput());
     opBuilder.addInputList(Operands.asOutputs(statsSummariesList));
     opBuilder.addInput(splitTypes.asOutput());
@@ -104,7 +104,6 @@ public static BoostedTreesCalculateBestFeatureSplitV2 create(Scope scope,
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(treeComplexity.asOutput());
     opBuilder.addInput(minNodeWeight.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("logits_dimension", logitsDimension);
     return new BoostedTreesCalculateBestFeatureSplitV2(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestGainsPerFeature.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestGainsPerFeature.java
index d09a1859ca5..ea1a95a6d51 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestGainsPerFeature.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestGainsPerFeature.java
@@ -95,14 +95,13 @@ public static BoostedTreesCalculateBestGainsPerFeature create(Scope scope,
       Operand<TInt32> nodeIdRange, Iterable<Operand<TFloat32>> statsSummaryList,
       Operand<TFloat32> l1, Operand<TFloat32> l2, Operand<TFloat32> treeComplexity,
       Operand<TFloat32> minNodeWeight, Long maxSplits) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCalculateBestGainsPerFeature"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesCalculateBestGainsPerFeature");
     opBuilder.addInput(nodeIdRange.asOutput());
     opBuilder.addInputList(Operands.asOutputs(statsSummaryList));
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(treeComplexity.asOutput());
     opBuilder.addInput(minNodeWeight.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("max_splits", maxSplits);
     return new BoostedTreesCalculateBestGainsPerFeature(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCenterBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCenterBias.java
index 06732ac99e8..dd45c6709a5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCenterBias.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCenterBias.java
@@ -62,13 +62,12 @@ private BoostedTreesCenterBias(Operation operation) {
   public static BoostedTreesCenterBias create(Scope scope,
       Operand<? extends TType> treeEnsembleHandle, Operand<TFloat32> meanGradients,
       Operand<TFloat32> meanHessians, Operand<TFloat32> l1, Operand<TFloat32> l2) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCenterBias"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesCenterBias");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
     opBuilder.addInput(meanGradients.asOutput());
     opBuilder.addInput(meanHessians.asOutput());
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesCenterBias(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateEnsemble.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateEnsemble.java
index 3e7eca3a7cf..0793a9d4dad 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateEnsemble.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateEnsemble.java
@@ -55,11 +55,10 @@ private BoostedTreesCreateEnsemble(Operation operation) {
   public static BoostedTreesCreateEnsemble create(Scope scope,
       Operand<? extends TType> treeEnsembleHandle, Operand<TInt64> stampToken,
       Operand<TString> treeEnsembleSerialized) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCreateEnsemble"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesCreateEnsemble");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
     opBuilder.addInput(stampToken.asOutput());
     opBuilder.addInput(treeEnsembleSerialized.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesCreateEnsemble(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateQuantileStreamResource.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateQuantileStreamResource.java
index 871f250c0ad..0fa016c985c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateQuantileStreamResource.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateQuantileStreamResource.java
@@ -56,11 +56,10 @@ private BoostedTreesCreateQuantileStreamResource(Operation operation) {
   public static BoostedTreesCreateQuantileStreamResource create(Scope scope,
       Operand<? extends TType> quantileStreamResourceHandle, Operand<TFloat32> epsilon,
       Operand<TInt64> numStreams, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCreateQuantileStreamResource"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesCreateQuantileStreamResource");
     opBuilder.addInput(quantileStreamResourceHandle.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(numStreams.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.maxElements != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesDeserializeEnsemble.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesDeserializeEnsemble.java
index d24acd613a6..40af63f7302 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesDeserializeEnsemble.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesDeserializeEnsemble.java
@@ -56,11 +56,10 @@ private BoostedTreesDeserializeEnsemble(Operation operation) {
   public static BoostedTreesDeserializeEnsemble create(Scope scope,
       Operand<? extends TType> treeEnsembleHandle, Operand<TInt64> stampToken,
       Operand<TString> treeEnsembleSerialized) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesDeserializeEnsemble"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesDeserializeEnsemble");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
     opBuilder.addInput(stampToken.asOutput());
     opBuilder.addInput(treeEnsembleSerialized.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesDeserializeEnsemble(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesEnsembleResourceHandleOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesEnsembleResourceHandleOp.java
index 821bf890f39..5d9a5b8687a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesEnsembleResourceHandleOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesEnsembleResourceHandleOp.java
@@ -55,8 +55,7 @@ private BoostedTreesEnsembleResourceHandleOp(Operation operation) {
       describeByClass = true
   )
   public static BoostedTreesEnsembleResourceHandleOp create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesEnsembleResourceHandleOp"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesEnsembleResourceHandleOp");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesExampleDebugOutputs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesExampleDebugOutputs.java
index 8115000d538..4576b2e4bb5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesExampleDebugOutputs.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesExampleDebugOutputs.java
@@ -66,10 +66,9 @@ private BoostedTreesExampleDebugOutputs(Operation operation) {
   public static BoostedTreesExampleDebugOutputs create(Scope scope,
       Operand<? extends TType> treeEnsembleHandle, Iterable<Operand<TInt32>> bucketizedFeatures,
       Long logitsDimension) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesExampleDebugOutputs"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesExampleDebugOutputs");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
     opBuilder.addInputList(Operands.asOutputs(bucketizedFeatures));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("logits_dimension", logitsDimension);
     return new BoostedTreesExampleDebugOutputs(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesFlushQuantileSummaries.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesFlushQuantileSummaries.java
index cb028d06e56..a3db29c7ec7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesFlushQuantileSummaries.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesFlushQuantileSummaries.java
@@ -66,9 +66,8 @@ private BoostedTreesFlushQuantileSummaries(Operation operation) {
   )
   public static BoostedTreesFlushQuantileSummaries create(Scope scope,
       Operand<? extends TType> quantileStreamResourceHandle, Long numFeatures) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesFlushQuantileSummaries"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesFlushQuantileSummaries");
     opBuilder.addInput(quantileStreamResourceHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_features", numFeatures);
     return new BoostedTreesFlushQuantileSummaries(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesGetEnsembleStates.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesGetEnsembleStates.java
index 3e87ddfda80..66c95e96655 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesGetEnsembleStates.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesGetEnsembleStates.java
@@ -69,9 +69,8 @@ private BoostedTreesGetEnsembleStates(Operation operation) {
   )
   public static BoostedTreesGetEnsembleStates create(Scope scope,
       Operand<? extends TType> treeEnsembleHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesGetEnsembleStates"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesGetEnsembleStates");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesGetEnsembleStates(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeQuantileSummaries.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeQuantileSummaries.java
index 69975228820..ad40fc7f30f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeQuantileSummaries.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeQuantileSummaries.java
@@ -67,11 +67,10 @@ private BoostedTreesMakeQuantileSummaries(Operation operation) {
   public static BoostedTreesMakeQuantileSummaries create(Scope scope,
       Iterable<Operand<TFloat32>> floatValues, Operand<TFloat32> exampleWeights,
       Operand<TFloat32> epsilon) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesMakeQuantileSummaries"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesMakeQuantileSummaries");
     opBuilder.addInputList(Operands.asOutputs(floatValues));
     opBuilder.addInput(exampleWeights.asOutput());
     opBuilder.addInput(epsilon.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesMakeQuantileSummaries(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeStatsSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeStatsSummary.java
index ea1744361ce..4827fd7cbcc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeStatsSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeStatsSummary.java
@@ -64,12 +64,11 @@ private BoostedTreesMakeStatsSummary(Operation operation) {
   public static BoostedTreesMakeStatsSummary create(Scope scope, Operand<TInt32> nodeIds,
       Operand<TFloat32> gradients, Operand<TFloat32> hessians,
       Iterable<Operand<TInt32>> bucketizedFeaturesList, Long maxSplits, Long numBuckets) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesMakeStatsSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesMakeStatsSummary");
     opBuilder.addInput(nodeIds.asOutput());
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(hessians.asOutput());
     opBuilder.addInputList(Operands.asOutputs(bucketizedFeaturesList));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("max_splits", maxSplits);
     opBuilder.setAttr("num_buckets", numBuckets);
     return new BoostedTreesMakeStatsSummary(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesPredict.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesPredict.java
index e3b23e355e9..0ac4d12e6ee 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesPredict.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesPredict.java
@@ -64,10 +64,9 @@ private BoostedTreesPredict(Operation operation) {
   )
   public static BoostedTreesPredict create(Scope scope, Operand<? extends TType> treeEnsembleHandle,
       Iterable<Operand<TInt32>> bucketizedFeatures, Long logitsDimension) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesPredict"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesPredict");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
     opBuilder.addInputList(Operands.asOutputs(bucketizedFeatures));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("logits_dimension", logitsDimension);
     return new BoostedTreesPredict(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceAddSummaries.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceAddSummaries.java
index f7db36bf019..954e39d5ad7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceAddSummaries.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceAddSummaries.java
@@ -57,10 +57,9 @@ private BoostedTreesQuantileStreamResourceAddSummaries(Operation operation) {
   public static BoostedTreesQuantileStreamResourceAddSummaries create(Scope scope,
       Operand<? extends TType> quantileStreamResourceHandle,
       Iterable<Operand<TFloat32>> summaries) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceAddSummaries"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesQuantileStreamResourceAddSummaries");
     opBuilder.addInput(quantileStreamResourceHandle.asOutput());
     opBuilder.addInputList(Operands.asOutputs(summaries));
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesQuantileStreamResourceAddSummaries(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceDeserialize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceDeserialize.java
index 616d5b5bb58..b5468eabcdd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceDeserialize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceDeserialize.java
@@ -55,10 +55,9 @@ private BoostedTreesQuantileStreamResourceDeserialize(Operation operation) {
   public static BoostedTreesQuantileStreamResourceDeserialize create(Scope scope,
       Operand<? extends TType> quantileStreamResourceHandle,
       Iterable<Operand<TFloat32>> bucketBoundaries) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceDeserialize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesQuantileStreamResourceDeserialize");
     opBuilder.addInput(quantileStreamResourceHandle.asOutput());
     opBuilder.addInputList(Operands.asOutputs(bucketBoundaries));
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesQuantileStreamResourceDeserialize(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceFlush.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceFlush.java
index ce36cb3e366..6fada5bf903 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceFlush.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceFlush.java
@@ -55,10 +55,9 @@ private BoostedTreesQuantileStreamResourceFlush(Operation operation) {
   public static BoostedTreesQuantileStreamResourceFlush create(Scope scope,
       Operand<? extends TType> quantileStreamResourceHandle, Operand<TInt64> numBuckets,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceFlush"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesQuantileStreamResourceFlush");
     opBuilder.addInput(quantileStreamResourceHandle.asOutput());
     opBuilder.addInput(numBuckets.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.generateQuantiles != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceGetBucketBoundaries.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceGetBucketBoundaries.java
index a44db108e17..c615b19b3ec 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceGetBucketBoundaries.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceGetBucketBoundaries.java
@@ -65,9 +65,8 @@ private BoostedTreesQuantileStreamResourceGetBucketBoundaries(Operation operatio
   )
   public static BoostedTreesQuantileStreamResourceGetBucketBoundaries create(Scope scope,
       Operand<? extends TType> quantileStreamResourceHandle, Long numFeatures) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceGetBucketBoundaries"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesQuantileStreamResourceGetBucketBoundaries");
     opBuilder.addInput(quantileStreamResourceHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_features", numFeatures);
     return new BoostedTreesQuantileStreamResourceGetBucketBoundaries(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceHandleOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceHandleOp.java
index 114ac3741ec..48af0041d87 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceHandleOp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceHandleOp.java
@@ -55,8 +55,7 @@ private BoostedTreesQuantileStreamResourceHandleOp(Operation operation) {
       describeByClass = true
   )
   public static BoostedTreesQuantileStreamResourceHandleOp create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceHandleOp"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesQuantileStreamResourceHandleOp");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSerializeEnsemble.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSerializeEnsemble.java
index eb2f5193659..b3c0bee4eb8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSerializeEnsemble.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSerializeEnsemble.java
@@ -60,9 +60,8 @@ private BoostedTreesSerializeEnsemble(Operation operation) {
   )
   public static BoostedTreesSerializeEnsemble create(Scope scope,
       Operand<? extends TType> treeEnsembleHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesSerializeEnsemble"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesSerializeEnsemble");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BoostedTreesSerializeEnsemble(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseAggregateStats.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseAggregateStats.java
index 7eb7971260f..7b6cae32a40 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseAggregateStats.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseAggregateStats.java
@@ -78,14 +78,13 @@ public static BoostedTreesSparseAggregateStats create(Scope scope, Operand<TInt3
       Operand<TFloat32> gradients, Operand<TFloat32> hessians, Operand<TInt32> featureIndices,
       Operand<TInt32> featureValues, Operand<TInt32> featureShape, Long maxSplits,
       Long numBuckets) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesSparseAggregateStats"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesSparseAggregateStats");
     opBuilder.addInput(nodeIds.asOutput());
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(hessians.asOutput());
     opBuilder.addInput(featureIndices.asOutput());
     opBuilder.addInput(featureValues.asOutput());
     opBuilder.addInput(featureShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("max_splits", maxSplits);
     opBuilder.setAttr("num_buckets", numBuckets);
     return new BoostedTreesSparseAggregateStats(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseCalculateBestFeatureSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseCalculateBestFeatureSplit.java
index d8541a15d9b..b5e90ffdb83 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseCalculateBestFeatureSplit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseCalculateBestFeatureSplit.java
@@ -92,7 +92,7 @@ public static BoostedTreesSparseCalculateBestFeatureSplit create(Scope scope,
       Operand<TFloat32> statsSummaryValues, Operand<TInt32> statsSummaryShape, Operand<TFloat32> l1,
       Operand<TFloat32> l2, Operand<TFloat32> treeComplexity, Operand<TFloat32> minNodeWeight,
       Long logitsDimension, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesSparseCalculateBestFeatureSplit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesSparseCalculateBestFeatureSplit");
     opBuilder.addInput(nodeIdRange.asOutput());
     opBuilder.addInput(statsSummaryIndices.asOutput());
     opBuilder.addInput(statsSummaryValues.asOutput());
@@ -101,7 +101,6 @@ public static BoostedTreesSparseCalculateBestFeatureSplit create(Scope scope,
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(treeComplexity.asOutput());
     opBuilder.addInput(minNodeWeight.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("logits_dimension", logitsDimension);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesTrainingPredict.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesTrainingPredict.java
index 55d400c9c0f..ea3356846b7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesTrainingPredict.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesTrainingPredict.java
@@ -77,12 +77,11 @@ public static BoostedTreesTrainingPredict create(Scope scope,
       Operand<? extends TType> treeEnsembleHandle, Operand<TInt32> cachedTreeIds,
       Operand<TInt32> cachedNodeIds, Iterable<Operand<TInt32>> bucketizedFeatures,
       Long logitsDimension) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesTrainingPredict"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesTrainingPredict");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
     opBuilder.addInput(cachedTreeIds.asOutput());
     opBuilder.addInput(cachedNodeIds.asOutput());
     opBuilder.addInputList(Operands.asOutputs(bucketizedFeatures));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("logits_dimension", logitsDimension);
     return new BoostedTreesTrainingPredict(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsemble.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsemble.java
index 93310fd7e96..69b68815545 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsemble.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsemble.java
@@ -75,7 +75,7 @@ public static BoostedTreesUpdateEnsemble create(Scope scope,
       Iterable<Operand<TInt32>> thresholds, Iterable<Operand<TFloat32>> leftNodeContribs,
       Iterable<Operand<TFloat32>> rightNodeContribs, Operand<TInt32> maxDepth,
       Operand<TFloat32> learningRate, Long pruningMode) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesUpdateEnsemble"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesUpdateEnsemble");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
     opBuilder.addInput(featureIds.asOutput());
     opBuilder.addInputList(Operands.asOutputs(nodeIds));
@@ -85,7 +85,6 @@ public static BoostedTreesUpdateEnsemble create(Scope scope,
     opBuilder.addInputList(Operands.asOutputs(rightNodeContribs));
     opBuilder.addInput(maxDepth.asOutput());
     opBuilder.addInput(learningRate.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("pruning_mode", pruningMode);
     return new BoostedTreesUpdateEnsemble(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsembleV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsembleV2.java
index ce10bb48d3c..e4ba8d4a353 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsembleV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsembleV2.java
@@ -80,7 +80,7 @@ public static BoostedTreesUpdateEnsembleV2 create(Scope scope,
       Iterable<Operand<TFloat32>> leftNodeContribs, Iterable<Operand<TFloat32>> rightNodeContribs,
       Iterable<Operand<TString>> splitTypes, Operand<TInt32> maxDepth,
       Operand<TFloat32> learningRate, Operand<TInt32> pruningMode, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesUpdateEnsembleV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BoostedTreesUpdateEnsembleV2");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
     opBuilder.addInputList(Operands.asOutputs(featureIds));
     opBuilder.addInputList(Operands.asOutputs(dimensionIds));
@@ -93,7 +93,6 @@ public static BoostedTreesUpdateEnsembleV2 create(Scope scope,
     opBuilder.addInput(maxDepth.asOutput());
     opBuilder.addInput(learningRate.asOutput());
     opBuilder.addInput(pruningMode.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.logitsDimension != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesEnsembleInitialized.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesEnsembleInitialized.java
index b4a4bf79800..98ca381fce6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesEnsembleInitialized.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesEnsembleInitialized.java
@@ -56,9 +56,8 @@ private IsBoostedTreesEnsembleInitialized(Operation operation) {
   )
   public static IsBoostedTreesEnsembleInitialized create(Scope scope,
       Operand<? extends TType> treeEnsembleHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsBoostedTreesEnsembleInitialized"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IsBoostedTreesEnsembleInitialized");
     opBuilder.addInput(treeEnsembleHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IsBoostedTreesEnsembleInitialized(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesQuantileStreamResourceInitialized.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesQuantileStreamResourceInitialized.java
index 12f6d5240db..0fce945d36f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesQuantileStreamResourceInitialized.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesQuantileStreamResourceInitialized.java
@@ -57,9 +57,8 @@ private IsBoostedTreesQuantileStreamResourceInitialized(Operation operation) {
   )
   public static IsBoostedTreesQuantileStreamResourceInitialized create(Scope scope,
       Operand<? extends TType> quantileStreamResourceHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsBoostedTreesQuantileStreamResourceInitialized"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IsBoostedTreesQuantileStreamResourceInitialized");
     opBuilder.addInput(quantileStreamResourceHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IsBoostedTreesQuantileStreamResourceInitialized(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustContrast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustContrast.java
index 6f928151576..151f7ddee9e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustContrast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustContrast.java
@@ -71,10 +71,9 @@ private AdjustContrast(Operation operation) {
   )
   public static <T extends TNumber> AdjustContrast<T> create(Scope scope, Operand<T> images,
       Operand<TFloat32> contrastFactor) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AdjustContrast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AdjustContrast");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(contrastFactor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AdjustContrast<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustHue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustHue.java
index 744bcdbfbf1..747f8f12713 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustHue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustHue.java
@@ -69,10 +69,9 @@ private AdjustHue(Operation operation) {
   )
   public static <T extends TNumber> AdjustHue<T> create(Scope scope, Operand<T> images,
       Operand<TFloat32> delta) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AdjustHue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AdjustHue");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(delta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AdjustHue<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustSaturation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustSaturation.java
index 5656c0748cf..0de6e84071b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustSaturation.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustSaturation.java
@@ -69,10 +69,9 @@ private AdjustSaturation(Operation operation) {
   )
   public static <T extends TNumber> AdjustSaturation<T> create(Scope scope, Operand<T> images,
       Operand<TFloat32> scale) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AdjustSaturation"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AdjustSaturation");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(scale.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AdjustSaturation<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CombinedNonMaxSuppression.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CombinedNonMaxSuppression.java
index 9f33ea0c760..5357f75dd95 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CombinedNonMaxSuppression.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CombinedNonMaxSuppression.java
@@ -97,14 +97,13 @@ private CombinedNonMaxSuppression(Operation operation) {
   public static CombinedNonMaxSuppression create(Scope scope, Operand<TFloat32> boxes,
       Operand<TFloat32> scores, Operand<TInt32> maxOutputSizePerClass, Operand<TInt32> maxTotalSize,
       Operand<TFloat32> iouThreshold, Operand<TFloat32> scoreThreshold, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CombinedNonMaxSuppression"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CombinedNonMaxSuppression");
     opBuilder.addInput(boxes.asOutput());
     opBuilder.addInput(scores.asOutput());
     opBuilder.addInput(maxOutputSizePerClass.asOutput());
     opBuilder.addInput(maxTotalSize.asOutput());
     opBuilder.addInput(iouThreshold.asOutput());
     opBuilder.addInput(scoreThreshold.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.padPerClass != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java
index 5477322a6c8..4d6f9761230 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java
@@ -94,12 +94,11 @@ private CropAndResize(Operation operation) {
   public static CropAndResize create(Scope scope, Operand<? extends TNumber> image,
       Operand<TFloat32> boxes, Operand<TInt32> boxInd, Operand<TInt32> cropSize,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CropAndResize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CropAndResize");
     opBuilder.addInput(image.asOutput());
     opBuilder.addInput(boxes.asOutput());
     opBuilder.addInput(boxInd.asOutput());
     opBuilder.addInput(cropSize.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.method != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java
index 64eb73d46b0..a43190b7447 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java
@@ -73,12 +73,11 @@ private CropAndResizeGradBoxes(Operation operation) {
   public static CropAndResizeGradBoxes create(Scope scope, Operand<TFloat32> grads,
       Operand<? extends TNumber> image, Operand<TFloat32> boxes, Operand<TInt32> boxInd,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CropAndResizeGradBoxes"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CropAndResizeGradBoxes");
     opBuilder.addInput(grads.asOutput());
     opBuilder.addInput(image.asOutput());
     opBuilder.addInput(boxes.asOutput());
     opBuilder.addInput(boxInd.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.method != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradImage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradImage.java
index 971cfe70dc5..48b350c1c6a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradImage.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradImage.java
@@ -79,12 +79,11 @@ private CropAndResizeGradImage(Operation operation) {
   public static <T extends TNumber> CropAndResizeGradImage<T> create(Scope scope,
       Operand<TFloat32> grads, Operand<TFloat32> boxes, Operand<TInt32> boxInd,
       Operand<TInt32> imageSize, Class<T> T, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CropAndResizeGradImage"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CropAndResizeGradImage");
     opBuilder.addInput(grads.asOutput());
     opBuilder.addInput(boxes.asOutput());
     opBuilder.addInput(boxInd.asOutput());
     opBuilder.addInput(imageSize.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("T", Operands.toDataType(T));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeAndCropJpeg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeAndCropJpeg.java
index 550219265be..21e551ab39f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeAndCropJpeg.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeAndCropJpeg.java
@@ -78,10 +78,9 @@ private DecodeAndCropJpeg(Operation operation) {
   )
   public static DecodeAndCropJpeg create(Scope scope, Operand<TString> contents,
       Operand<TInt32> cropWindow, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeAndCropJpeg"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeAndCropJpeg");
     opBuilder.addInput(contents.asOutput());
     opBuilder.addInput(cropWindow.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.channels != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeBmp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeBmp.java
index f2cfe2c86f7..922f9912a13 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeBmp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeBmp.java
@@ -68,9 +68,8 @@ private DecodeBmp(Operation operation) {
       describeByClass = true
   )
   public static DecodeBmp create(Scope scope, Operand<TString> contents, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeBmp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeBmp");
     opBuilder.addInput(contents.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.channels != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeGif.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeGif.java
index 85b936f7818..1007eba6b56 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeGif.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeGif.java
@@ -67,9 +67,8 @@ private DecodeGif(Operation operation) {
       describeByClass = true
   )
   public static DecodeGif create(Scope scope, Operand<TString> contents) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeGif"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeGif");
     opBuilder.addInput(contents.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DecodeGif(opBuilder.build());
   }
 
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 8b6951f2da7..375b6eb693d 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
@@ -82,9 +82,8 @@ private DecodeImage(Operation operation) {
   )
   public static <T extends TNumber> DecodeImage<T> create(Scope scope, Operand<TString> contents,
       Class<T> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeImage"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeImage");
     opBuilder.addInput(contents.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeJpeg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeJpeg.java
index 5e11fe84aa0..48241719071 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeJpeg.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeJpeg.java
@@ -75,9 +75,8 @@ private DecodeJpeg(Operation operation) {
       describeByClass = true
   )
   public static DecodeJpeg create(Scope scope, Operand<TString> contents, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeJpeg"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeJpeg");
     opBuilder.addInput(contents.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.channels != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodePng.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodePng.java
index 2b3591fafcb..30beedadb3d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodePng.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodePng.java
@@ -80,9 +80,8 @@ private DecodePng(Operation operation) {
   )
   public static <T extends TNumber> DecodePng<T> create(Scope scope, Operand<TString> contents,
       Class<T> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodePng"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodePng");
     opBuilder.addInput(contents.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DrawBoundingBoxes.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DrawBoundingBoxes.java
index 980487d0c3b..9ed95d1cb4f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DrawBoundingBoxes.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DrawBoundingBoxes.java
@@ -75,11 +75,10 @@ private DrawBoundingBoxes(Operation operation) {
   )
   public static <T extends TNumber> DrawBoundingBoxes<T> create(Scope scope, Operand<T> images,
       Operand<TFloat32> boxes, Operand<TFloat32> colors) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DrawBoundingBoxes"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DrawBoundingBoxes");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(boxes.asOutput());
     opBuilder.addInput(colors.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DrawBoundingBoxes<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpeg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpeg.java
index 81ad610f790..3fd8f3c3e0f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpeg.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpeg.java
@@ -76,9 +76,8 @@ private EncodeJpeg(Operation operation) {
       describeByClass = true
   )
   public static EncodeJpeg create(Scope scope, Operand<TUint8> image, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeJpeg"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EncodeJpeg");
     opBuilder.addInput(image.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.format != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpegVariableQuality.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpegVariableQuality.java
index 732ca7bf7a7..1a9960ab6ad 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpegVariableQuality.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpegVariableQuality.java
@@ -64,10 +64,9 @@ private EncodeJpegVariableQuality(Operation operation) {
   )
   public static EncodeJpegVariableQuality create(Scope scope, Operand<TUint8> images,
       Operand<TInt32> quality) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeJpegVariableQuality"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EncodeJpegVariableQuality");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(quality.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new EncodeJpegVariableQuality(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java
index e9994f0dad6..21823f42582 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java
@@ -72,9 +72,8 @@ private EncodePng(Operation operation) {
   )
   public static EncodePng create(Scope scope, Operand<? extends TNumber> image,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodePng"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EncodePng");
     opBuilder.addInput(image.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.compression != null) {
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 ac4a33f2e01..d90f89c2b05 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
@@ -81,11 +81,10 @@ private ExtractGlimpse(Operation operation) {
   )
   public static ExtractGlimpse create(Scope scope, Operand<TFloat32> input,
       Operand<TInt32> sizeOutput, Operand<TFloat32> offsets, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExtractGlimpse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ExtractGlimpse");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(offsets.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.centered != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractImagePatches.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractImagePatches.java
index 7843008dbeb..28c178721c6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractImagePatches.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractImagePatches.java
@@ -73,9 +73,8 @@ private ExtractImagePatches(Operation operation) {
   )
   public static <T extends TType> ExtractImagePatches<T> create(Scope scope, Operand<T> images,
       List<Long> ksizes, List<Long> strides, List<Long> rates, String padding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExtractImagePatches"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ExtractImagePatches");
     opBuilder.addInput(images.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizesArray = new long[ksizes.size()];
     for (int i = 0 ; i < ksizesArray.length ; i++) {
       ksizesArray[i] = ksizes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractJpegShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractJpegShape.java
index 23a922277ad..880ee3722cd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractJpegShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractJpegShape.java
@@ -68,9 +68,8 @@ private ExtractJpegShape(Operation operation) {
   )
   public static <T extends TNumber> ExtractJpegShape<T> create(Scope scope,
       Operand<TString> contents, Class<T> outputType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExtractJpegShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ExtractJpegShape");
     opBuilder.addInput(contents.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_type", Operands.toDataType(outputType));
     return new ExtractJpegShape<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/GenerateBoundingBoxProposals.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/GenerateBoundingBoxProposals.java
index 54dd35813f7..0607171e993 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/GenerateBoundingBoxProposals.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/GenerateBoundingBoxProposals.java
@@ -82,7 +82,7 @@ public static GenerateBoundingBoxProposals create(Scope scope, Operand<TFloat32>
       Operand<TFloat32> bboxDeltas, Operand<TFloat32> imageInfo, Operand<TFloat32> anchors,
       Operand<TFloat32> nmsThreshold, Operand<TInt32> preNmsTopn, Operand<TFloat32> minSize,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GenerateBoundingBoxProposals"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GenerateBoundingBoxProposals");
     opBuilder.addInput(scores.asOutput());
     opBuilder.addInput(bboxDeltas.asOutput());
     opBuilder.addInput(imageInfo.asOutput());
@@ -90,7 +90,6 @@ public static GenerateBoundingBoxProposals create(Scope scope, Operand<TFloat32>
     opBuilder.addInput(nmsThreshold.asOutput());
     opBuilder.addInput(preNmsTopn.asOutput());
     opBuilder.addInput(minSize.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.postNmsTopn != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/HsvToRgb.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/HsvToRgb.java
index 0fdfc5daac0..16a7bc54010 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/HsvToRgb.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/HsvToRgb.java
@@ -65,9 +65,8 @@ private HsvToRgb(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> HsvToRgb<T> create(Scope scope, Operand<T> images) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("HsvToRgb"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "HsvToRgb");
     opBuilder.addInput(images.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new HsvToRgb<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV2.java
index 97d3244bd27..e7e270e7584 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV2.java
@@ -72,11 +72,10 @@ private ImageProjectiveTransformV2(Operation operation) {
   public static <T extends TNumber> ImageProjectiveTransformV2<T> create(Scope scope,
       Operand<T> images, Operand<TFloat32> transforms, Operand<TInt32> outputShape,
       String interpolation, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImageProjectiveTransformV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ImageProjectiveTransformV2");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(transforms.asOutput());
     opBuilder.addInput(outputShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("interpolation", interpolation);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV3.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV3.java
index 434260d117c..463275fda01 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV3.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV3.java
@@ -73,12 +73,11 @@ private ImageProjectiveTransformV3(Operation operation) {
   public static <T extends TNumber> ImageProjectiveTransformV3<T> create(Scope scope,
       Operand<T> images, Operand<TFloat32> transforms, Operand<TInt32> outputShape,
       Operand<TFloat32> fillValue, String interpolation, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImageProjectiveTransformV3"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ImageProjectiveTransformV3");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(transforms.asOutput());
     opBuilder.addInput(outputShape.asOutput());
     opBuilder.addInput(fillValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("interpolation", interpolation);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NearestNeighbors.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NearestNeighbors.java
index 085e8e7ae05..36ce8f31151 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NearestNeighbors.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NearestNeighbors.java
@@ -65,11 +65,10 @@ private NearestNeighbors(Operation operation) {
   )
   public static NearestNeighbors create(Scope scope, Operand<TFloat32> points,
       Operand<TFloat32> centers, Operand<TInt64> k) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NearestNeighbors"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NearestNeighbors");
     opBuilder.addInput(points.asOutput());
     opBuilder.addInput(centers.asOutput());
     opBuilder.addInput(k.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new NearestNeighbors(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppression.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppression.java
index 82082ac8d74..907ed3a5055 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppression.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppression.java
@@ -104,14 +104,13 @@ private NonMaxSuppression(Operation operation) {
   public static <T extends TNumber> NonMaxSuppression<T> create(Scope scope, Operand<T> boxes,
       Operand<T> scores, Operand<TInt32> maxOutputSize, Operand<T> iouThreshold,
       Operand<T> scoreThreshold, Operand<T> softNmsSigma, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonMaxSuppression"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NonMaxSuppression");
     opBuilder.addInput(boxes.asOutput());
     opBuilder.addInput(scores.asOutput());
     opBuilder.addInput(maxOutputSize.asOutput());
     opBuilder.addInput(iouThreshold.asOutput());
     opBuilder.addInput(scoreThreshold.asOutput());
     opBuilder.addInput(softNmsSigma.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.padToMaxOutputSize != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppressionWithOverlaps.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppressionWithOverlaps.java
index 4c7fd59444c..c5ebfebdb71 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppressionWithOverlaps.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppressionWithOverlaps.java
@@ -82,13 +82,12 @@ private NonMaxSuppressionWithOverlaps(Operation operation) {
   public static NonMaxSuppressionWithOverlaps create(Scope scope, Operand<TFloat32> overlaps,
       Operand<TFloat32> scores, Operand<TInt32> maxOutputSize, Operand<TFloat32> overlapThreshold,
       Operand<TFloat32> scoreThreshold) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonMaxSuppressionWithOverlaps"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NonMaxSuppressionWithOverlaps");
     opBuilder.addInput(overlaps.asOutput());
     opBuilder.addInput(scores.asOutput());
     opBuilder.addInput(maxOutputSize.asOutput());
     opBuilder.addInput(overlapThreshold.asOutput());
     opBuilder.addInput(scoreThreshold.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new NonMaxSuppressionWithOverlaps(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/QuantizedResizeBilinear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/QuantizedResizeBilinear.java
index 1a08a0835d0..79c01f8a7dc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/QuantizedResizeBilinear.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/QuantizedResizeBilinear.java
@@ -77,12 +77,11 @@ private QuantizedResizeBilinear(Operation operation) {
   public static <T extends TNumber> QuantizedResizeBilinear<T> create(Scope scope,
       Operand<T> images, Operand<TInt32> sizeOutput, Operand<TFloat32> min, Operand<TFloat32> max,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedResizeBilinear"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedResizeBilinear");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(min.asOutput());
     opBuilder.addInput(max.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alignCorners != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RandomCrop.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RandomCrop.java
index c8b3afda622..e791a670099 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RandomCrop.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RandomCrop.java
@@ -70,10 +70,9 @@ private RandomCrop(Operation operation) {
   )
   public static <T extends TNumber> RandomCrop<T> create(Scope scope, Operand<T> image,
       Operand<TInt64> sizeOutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomCrop"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomCrop");
     opBuilder.addInput(image.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.seed != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java
index 5358048f92c..b83213e6ddf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java
@@ -73,10 +73,9 @@ private ResizeArea(Operation operation) {
   )
   public static ResizeArea create(Scope scope, Operand<? extends TNumber> images,
       Operand<TInt32> sizeOutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeArea"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResizeArea");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alignCorners != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java
index a4814622c6e..9453984bb64 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java
@@ -65,10 +65,9 @@ private ResizeBicubic(Operation operation) {
   )
   public static ResizeBicubic create(Scope scope, Operand<? extends TNumber> images,
       Operand<TInt32> sizeOutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeBicubic"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResizeBicubic");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alignCorners != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubicGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubicGrad.java
index 9c5c786215f..77b7a4ff486 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubicGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubicGrad.java
@@ -62,10 +62,9 @@ private ResizeBicubicGrad(Operation operation) {
   )
   public static <T extends TNumber> ResizeBicubicGrad<T> create(Scope scope,
       Operand<TFloat32> grads, Operand<T> originalImage, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeBicubicGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResizeBicubicGrad");
     opBuilder.addInput(grads.asOutput());
     opBuilder.addInput(originalImage.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alignCorners != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java
index ab625f8fa43..20cf19314b1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java
@@ -65,10 +65,9 @@ private ResizeBilinear(Operation operation) {
   )
   public static ResizeBilinear create(Scope scope, Operand<? extends TNumber> images,
       Operand<TInt32> sizeOutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeBilinear"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResizeBilinear");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alignCorners != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinearGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinearGrad.java
index 3f1324421d0..4e71b41ddcf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinearGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinearGrad.java
@@ -62,10 +62,9 @@ private ResizeBilinearGrad(Operation operation) {
   )
   public static <T extends TNumber> ResizeBilinearGrad<T> create(Scope scope,
       Operand<TFloat32> grads, Operand<T> originalImage, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeBilinearGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResizeBilinearGrad");
     opBuilder.addInput(grads.asOutput());
     opBuilder.addInput(originalImage.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alignCorners != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighbor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighbor.java
index 2f3e188c9f0..916023700e4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighbor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighbor.java
@@ -66,10 +66,9 @@ private ResizeNearestNeighbor(Operation operation) {
   )
   public static <T extends TNumber> ResizeNearestNeighbor<T> create(Scope scope, Operand<T> images,
       Operand<TInt32> sizeOutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeNearestNeighbor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResizeNearestNeighbor");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alignCorners != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighborGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighborGrad.java
index ea78ad2422c..16ed3716716 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighborGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighborGrad.java
@@ -62,10 +62,9 @@ private ResizeNearestNeighborGrad(Operation operation) {
   )
   public static <T extends TNumber> ResizeNearestNeighborGrad<T> create(Scope scope,
       Operand<T> grads, Operand<TInt32> sizeOutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeNearestNeighborGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResizeNearestNeighborGrad");
     opBuilder.addInput(grads.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alignCorners != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RgbToHsv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RgbToHsv.java
index 2a1a81c7543..b61b476fa53 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RgbToHsv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RgbToHsv.java
@@ -82,9 +82,8 @@ private RgbToHsv(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RgbToHsv<T> create(Scope scope, Operand<T> images) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RgbToHsv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RgbToHsv");
     opBuilder.addInput(images.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RgbToHsv<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/SampleDistortedBoundingBox.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/SampleDistortedBoundingBox.java
index 0148cf27973..f4cab77b394 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/SampleDistortedBoundingBox.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/SampleDistortedBoundingBox.java
@@ -112,11 +112,10 @@ private SampleDistortedBoundingBox(Operation operation) {
   public static <T extends TNumber> SampleDistortedBoundingBox<T> create(Scope scope,
       Operand<T> imageSize, Operand<TFloat32> boundingBoxes, Operand<TFloat32> minObjectCovered,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SampleDistortedBoundingBox"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SampleDistortedBoundingBox");
     opBuilder.addInput(imageSize.asOutput());
     opBuilder.addInput(boundingBoxes.asOutput());
     opBuilder.addInput(minObjectCovered.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.seed != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java
index 5569ff2873e..6c90fce4b0d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java
@@ -66,12 +66,11 @@ private ScaleAndTranslate(Operation operation) {
   public static ScaleAndTranslate create(Scope scope, Operand<? extends TNumber> images,
       Operand<TInt32> sizeOutput, Operand<TFloat32> scale, Operand<TFloat32> translation,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScaleAndTranslate"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScaleAndTranslate");
     opBuilder.addInput(images.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(scale.asOutput());
     opBuilder.addInput(translation.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.kernelType != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslateGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslateGrad.java
index 4afc53b6144..c9dd12e7d31 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslateGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslateGrad.java
@@ -64,12 +64,11 @@ private ScaleAndTranslateGrad(Operation operation) {
   public static <T extends TNumber> ScaleAndTranslateGrad<T> create(Scope scope, Operand<T> grads,
       Operand<T> originalImage, Operand<TFloat32> scale, Operand<TFloat32> translation,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScaleAndTranslateGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScaleAndTranslateGrad");
     opBuilder.addInput(grads.asOutput());
     opBuilder.addInput(originalImage.asOutput());
     opBuilder.addInput(scale.asOutput());
     opBuilder.addInput(translation.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.kernelType != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/StatelessSampleDistortedBoundingBox.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/StatelessSampleDistortedBoundingBox.java
index cf52a0dd9ce..43ced526792 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/StatelessSampleDistortedBoundingBox.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/StatelessSampleDistortedBoundingBox.java
@@ -139,12 +139,11 @@ private StatelessSampleDistortedBoundingBox(Operation operation) {
   public static <T extends TNumber> StatelessSampleDistortedBoundingBox<T> create(Scope scope,
       Operand<T> imageSize, Operand<TFloat32> boundingBoxes, Operand<TFloat32> minObjectCovered,
       Operand<? extends TNumber> seed, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessSampleDistortedBoundingBox"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessSampleDistortedBoundingBox");
     opBuilder.addInput(imageSize.asOutput());
     opBuilder.addInput(boundingBoxes.asOutput());
     opBuilder.addInput(minObjectCovered.asOutput());
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.aspectRatioRange != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeBase64.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeBase64.java
index c8a01988603..0b2b977050b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeBase64.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeBase64.java
@@ -60,9 +60,8 @@ private DecodeBase64(Operation operation) {
       describeByClass = true
   )
   public static DecodeBase64 create(Scope scope, Operand<TString> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeBase64"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeBase64");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DecodeBase64(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCompressed.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCompressed.java
index d90bac56d9c..94adf046198 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCompressed.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCompressed.java
@@ -64,9 +64,8 @@ private DecodeCompressed(Operation operation) {
       describeByClass = true
   )
   public static DecodeCompressed create(Scope scope, Operand<TString> bytes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeCompressed"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeCompressed");
     opBuilder.addInput(bytes.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.compressionType != null) {
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 f490599bb3b..0076c52f1b5 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
@@ -75,10 +75,9 @@ private DecodeCsv(Operation operation) {
   )
   public static DecodeCsv create(Scope scope, Operand<TString> records,
       Iterable<Operand<?>> recordDefaults, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeCsv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeCsv");
     opBuilder.addInput(records.asOutput());
     opBuilder.addInputList(Operands.asOutputs(recordDefaults));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.fieldDelim != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeJsonExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeJsonExample.java
index a139beb6e2d..7d56647384c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeJsonExample.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeJsonExample.java
@@ -66,9 +66,8 @@ private DecodeJsonExample(Operation operation) {
       describeByClass = true
   )
   public static DecodeJsonExample create(Scope scope, Operand<TString> jsonExamples) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeJsonExample"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeJsonExample");
     opBuilder.addInput(jsonExamples.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DecodeJsonExample(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodePaddedRaw.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodePaddedRaw.java
index 469742d7626..2bee34b952d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodePaddedRaw.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodePaddedRaw.java
@@ -70,10 +70,9 @@ private DecodePaddedRaw(Operation operation) {
   public static <T extends TNumber> DecodePaddedRaw<T> create(Scope scope,
       Operand<TString> inputBytes, Operand<TInt32> fixedLength, Class<T> outType,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodePaddedRaw"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodePaddedRaw");
     opBuilder.addInput(inputBytes.asOutput());
     opBuilder.addInput(fixedLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeRaw.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeRaw.java
index 791c3e61b8a..af00d63a45f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeRaw.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeRaw.java
@@ -66,9 +66,8 @@ private DecodeRaw(Operation operation) {
   )
   public static <T extends TType> DecodeRaw<T> create(Scope scope, Operand<TString> bytes,
       Class<T> outType, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeRaw"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DecodeRaw");
     opBuilder.addInput(bytes.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DeserializeManySparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DeserializeManySparse.java
index a3780bff1c2..93380160f31 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DeserializeManySparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DeserializeManySparse.java
@@ -112,9 +112,8 @@ private DeserializeManySparse(Operation operation) {
   )
   public static <T extends TType> DeserializeManySparse<T> create(Scope scope,
       Operand<TString> serializedSparse, Class<T> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeserializeManySparse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeserializeManySparse");
     opBuilder.addInput(serializedSparse.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new DeserializeManySparse<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/EncodeBase64.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/EncodeBase64.java
index b3f42819398..6b1d2623b00 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/EncodeBase64.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/EncodeBase64.java
@@ -64,9 +64,8 @@ private EncodeBase64(Operation operation) {
       describeByClass = true
   )
   public static EncodeBase64 create(Scope scope, Operand<TString> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeBase64"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EncodeBase64");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.pad != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FifoQueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FifoQueue.java
index b83dffd8223..e024c6e94f8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FifoQueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FifoQueue.java
@@ -65,8 +65,7 @@ private FifoQueue(Operation operation) {
   )
   public static FifoQueue create(Scope scope, List<Class<? extends TType>> componentTypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FifoQueue"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FifoQueue");
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FixedLengthRecordReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FixedLengthRecordReader.java
index 7236821a724..719f83c45e3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FixedLengthRecordReader.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FixedLengthRecordReader.java
@@ -60,8 +60,7 @@ private FixedLengthRecordReader(Operation operation) {
       describeByClass = true
   )
   public static FixedLengthRecordReader create(Scope scope, Long recordBytes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FixedLengthRecordReader"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FixedLengthRecordReader");
     opBuilder.setAttr("record_bytes", recordBytes);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/IdentityReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/IdentityReader.java
index 9e319c77bb2..bc70cf49882 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/IdentityReader.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/IdentityReader.java
@@ -61,8 +61,7 @@ private IdentityReader(Operation operation) {
       describeByClass = true
   )
   public static IdentityReader create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IdentityReader"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IdentityReader");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/LmdbReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/LmdbReader.java
index cc136db7e30..e29f59597ef 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/LmdbReader.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/LmdbReader.java
@@ -58,8 +58,7 @@ private LmdbReader(Operation operation) {
       describeByClass = true
   )
   public static LmdbReader create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LmdbReader"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LmdbReader");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/MatchingFiles.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/MatchingFiles.java
index 79db5b7b67c..604aacfb348 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/MatchingFiles.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/MatchingFiles.java
@@ -61,9 +61,8 @@ private MatchingFiles(Operation operation) {
       describeByClass = true
   )
   public static MatchingFiles create(Scope scope, Operand<TString> pattern) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatchingFiles"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatchingFiles");
     opBuilder.addInput(pattern.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MatchingFiles(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PaddingFifoQueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PaddingFifoQueue.java
index c12c95bf0e4..fd89bf18ede 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PaddingFifoQueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PaddingFifoQueue.java
@@ -68,8 +68,7 @@ private PaddingFifoQueue(Operation operation) {
   )
   public static PaddingFifoQueue create(Scope scope, List<Class<? extends TType>> componentTypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PaddingFifoQueue"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PaddingFifoQueue");
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseExample.java
index 6013eb885d3..2d4958fffb0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseExample.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseExample.java
@@ -146,14 +146,13 @@ public static ParseExample create(Scope scope, Operand<TString> serialized,
       Operand<TString> raggedKeys, Iterable<Operand<?>> denseDefaults, Long numSparse,
       List<Class<? extends TType>> sparseTypes, List<Class<? extends TType>> raggedValueTypes,
       List<Class<? extends TNumber>> raggedSplitTypes, List<Shape> denseShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseExample"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParseExample");
     opBuilder.addInput(serialized.asOutput());
     opBuilder.addInput(names.asOutput());
     opBuilder.addInput(sparseKeys.asOutput());
     opBuilder.addInput(denseKeys.asOutput());
     opBuilder.addInput(raggedKeys.asOutput());
     opBuilder.addInputList(Operands.asOutputs(denseDefaults));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_sparse", numSparse);
     opBuilder.setAttr("sparse_types", Operands.toDataTypes(sparseTypes));
     opBuilder.setAttr("ragged_value_types", Operands.toDataTypes(raggedValueTypes));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSequenceExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSequenceExample.java
index a56a0e66fae..5482d1ff93a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSequenceExample.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSequenceExample.java
@@ -186,7 +186,7 @@ public static ParseSequenceExample create(Scope scope, Operand<TString> serializ
       List<Class<? extends TType>> featureListSparseTypes,
       List<Class<? extends TType>> featureListRaggedValueTypes,
       List<Class<? extends TNumber>> featureListRaggedSplitTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseSequenceExample"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParseSequenceExample");
     opBuilder.addInput(serialized.asOutput());
     opBuilder.addInput(debugName.asOutput());
     opBuilder.addInput(contextSparseKeys.asOutput());
@@ -197,7 +197,6 @@ public static ParseSequenceExample create(Scope scope, Operand<TString> serializ
     opBuilder.addInput(featureListRaggedKeys.asOutput());
     opBuilder.addInput(featureListDenseMissingAssumedEmpty.asOutput());
     opBuilder.addInputList(Operands.asOutputs(contextDenseDefaults));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("context_sparse_types", Operands.toDataTypes(contextSparseTypes));
     opBuilder.setAttr("context_ragged_value_types", Operands.toDataTypes(contextRaggedValueTypes));
     opBuilder.setAttr("context_ragged_split_types", Operands.toDataTypes(contextRaggedSplitTypes));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleExample.java
index d4bb50938a5..8db82e49e41 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleExample.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleExample.java
@@ -113,10 +113,9 @@ private ParseSingleExample(Operation operation) {
   public static ParseSingleExample create(Scope scope, Operand<TString> serialized,
       Iterable<Operand<?>> denseDefaults, Long numSparse, List<String> sparseKeys,
       List<String> denseKeys, List<Class<? extends TType>> sparseTypes, List<Shape> denseShapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseSingleExample"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParseSingleExample");
     opBuilder.addInput(serialized.asOutput());
     opBuilder.addInputList(Operands.asOutputs(denseDefaults));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_sparse", numSparse);
     String[] sparseKeysArray = new String[sparseKeys.size()];
     for (int i = 0 ; i < sparseKeysArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleSequenceExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleSequenceExample.java
index e251c7dcdac..f7517cfe3a1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleSequenceExample.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleSequenceExample.java
@@ -148,7 +148,7 @@ public static ParseSingleSequenceExample create(Scope scope, Operand<TString> se
       Operand<TString> debugName, List<Class<? extends TType>> contextSparseTypes,
       List<Class<? extends TType>> featureListDenseTypes,
       List<Class<? extends TType>> featureListSparseTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseSingleSequenceExample"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParseSingleSequenceExample");
     opBuilder.addInput(serialized.asOutput());
     opBuilder.addInput(featureListDenseMissingAssumedEmpty.asOutput());
     opBuilder.addInputList(Operands.asOutputs(contextSparseKeys));
@@ -157,7 +157,6 @@ public static ParseSingleSequenceExample create(Scope scope, Operand<TString> se
     opBuilder.addInputList(Operands.asOutputs(featureListDenseKeys));
     opBuilder.addInputList(Operands.asOutputs(contextDenseDefaults));
     opBuilder.addInput(debugName.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("context_sparse_types", Operands.toDataTypes(contextSparseTypes));
     opBuilder.setAttr("feature_list_dense_types", Operands.toDataTypes(featureListDenseTypes));
     opBuilder.setAttr("feature_list_sparse_types", Operands.toDataTypes(featureListSparseTypes));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseTensor.java
index ecabdeedd1d..3a49a3ba191 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseTensor.java
@@ -66,9 +66,8 @@ private ParseTensor(Operation operation) {
   )
   public static <T extends TType> ParseTensor<T> create(Scope scope, Operand<TString> serialized,
       Class<T> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseTensor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParseTensor");
     opBuilder.addInput(serialized.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new ParseTensor<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PriorityQueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PriorityQueue.java
index 40494e12bbb..893f41c9b33 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PriorityQueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PriorityQueue.java
@@ -73,8 +73,7 @@ private PriorityQueue(Operation operation) {
   )
   public static PriorityQueue create(Scope scope, List<Class<? extends TType>> componentTypes,
       List<Shape> shapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PriorityQueue"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PriorityQueue");
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     Shape[] shapesArray = new Shape[shapes.size()];
     for (int i = 0 ; i < shapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueClose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueClose.java
index 6be7248ac76..a982ee68ff5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueClose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueClose.java
@@ -60,9 +60,8 @@ private QueueClose(Operation operation) {
   )
   public static QueueClose create(Scope scope, Operand<? extends TType> handle,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueClose"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QueueClose");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.cancelPendingEnqueues != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeue.java
index b5e34e4b502..2f6692c5d92 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeue.java
@@ -73,9 +73,8 @@ private QueueDequeue(Operation operation) {
   )
   public static QueueDequeue create(Scope scope, Operand<? extends TType> handle,
       List<Class<? extends TType>> componentTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueDequeue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QueueDequeue");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueMany.java
index 0974a0a1123..b7128d86bc0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueMany.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueMany.java
@@ -80,10 +80,9 @@ private QueueDequeueMany(Operation operation) {
   )
   public static QueueDequeueMany create(Scope scope, Operand<? extends TType> handle,
       Operand<TInt32> n, List<Class<? extends TType>> componentTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueDequeueMany"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QueueDequeueMany");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(n.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueUpTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueUpTo.java
index 4a48ab57803..10ab3ed3307 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueUpTo.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueUpTo.java
@@ -84,10 +84,9 @@ private QueueDequeueUpTo(Operation operation) {
   )
   public static QueueDequeueUpTo create(Scope scope, Operand<? extends TType> handle,
       Operand<TInt32> n, List<Class<? extends TType>> componentTypes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueDequeueUpTo"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QueueDequeueUpTo");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(n.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueue.java
index 35dd60dbdcf..d4df07bb301 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueue.java
@@ -61,10 +61,9 @@ private QueueEnqueue(Operation operation) {
   )
   public static QueueEnqueue create(Scope scope, Operand<? extends TType> handle,
       Iterable<Operand<?>> components, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueEnqueue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QueueEnqueue");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInputList(Operands.asOutputs(components));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.timeoutMs != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueueMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueueMany.java
index e6cf9c9926e..04b14587a04 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueueMany.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueueMany.java
@@ -65,10 +65,9 @@ private QueueEnqueueMany(Operation operation) {
   )
   public static QueueEnqueueMany create(Scope scope, Operand<? extends TType> handle,
       Iterable<Operand<?>> components, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueEnqueueMany"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QueueEnqueueMany");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInputList(Operands.asOutputs(components));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.timeoutMs != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueIsClosed.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueIsClosed.java
index 9df0cef815e..edb895517b6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueIsClosed.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueIsClosed.java
@@ -61,9 +61,8 @@ private QueueIsClosed(Operation operation) {
       describeByClass = true
   )
   public static QueueIsClosed create(Scope scope, Operand<? extends TType> handle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueIsClosed"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QueueIsClosed");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new QueueIsClosed(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueSize.java
index ff803a50843..d585e6bfc69 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueSize.java
@@ -59,9 +59,8 @@ private QueueSize(Operation operation) {
       describeByClass = true
   )
   public static QueueSize create(Scope scope, Operand<? extends TType> handle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueSize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QueueSize");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new QueueSize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/RandomShuffleQueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/RandomShuffleQueue.java
index 7a3cbd62c62..9058ef08c5c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/RandomShuffleQueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/RandomShuffleQueue.java
@@ -65,8 +65,7 @@ private RandomShuffleQueue(Operation operation) {
   )
   public static RandomShuffleQueue create(Scope scope, List<Class<? extends TType>> componentTypes,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomShuffleQueue"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomShuffleQueue");
     opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReadFile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReadFile.java
index 5eafc6682ea..898d1e577e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReadFile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReadFile.java
@@ -58,9 +58,8 @@ private ReadFile(Operation operation) {
       describeByClass = true
   )
   public static ReadFile create(Scope scope, Operand<TString> filename) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReadFile"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReadFile");
     opBuilder.addInput(filename.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReadFile(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumRecordsProduced.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumRecordsProduced.java
index 31952d11fcd..6d49f6b8947 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumRecordsProduced.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumRecordsProduced.java
@@ -62,9 +62,8 @@ private ReaderNumRecordsProduced(Operation operation) {
   )
   public static ReaderNumRecordsProduced create(Scope scope,
       Operand<? extends TType> readerHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderNumRecordsProduced"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReaderNumRecordsProduced");
     opBuilder.addInput(readerHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReaderNumRecordsProduced(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumWorkUnitsCompleted.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumWorkUnitsCompleted.java
index 7e2de97fd90..01b3d0fec55 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumWorkUnitsCompleted.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumWorkUnitsCompleted.java
@@ -60,9 +60,8 @@ private ReaderNumWorkUnitsCompleted(Operation operation) {
   )
   public static ReaderNumWorkUnitsCompleted create(Scope scope,
       Operand<? extends TType> readerHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderNumWorkUnitsCompleted"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReaderNumWorkUnitsCompleted");
     opBuilder.addInput(readerHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReaderNumWorkUnitsCompleted(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRead.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRead.java
index d205d033ed2..6e47e762d54 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRead.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRead.java
@@ -67,10 +67,9 @@ private ReaderRead(Operation operation) {
   )
   public static ReaderRead create(Scope scope, Operand<? extends TType> readerHandle,
       Operand<? extends TType> queueHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderRead"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReaderRead");
     opBuilder.addInput(readerHandle.asOutput());
     opBuilder.addInput(queueHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReaderRead(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReadUpTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReadUpTo.java
index 3e5b3100870..87094364f9f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReadUpTo.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReadUpTo.java
@@ -70,11 +70,10 @@ private ReaderReadUpTo(Operation operation) {
   )
   public static ReaderReadUpTo create(Scope scope, Operand<? extends TType> readerHandle,
       Operand<? extends TType> queueHandle, Operand<TInt64> numRecords) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderReadUpTo"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReaderReadUpTo");
     opBuilder.addInput(readerHandle.asOutput());
     opBuilder.addInput(queueHandle.asOutput());
     opBuilder.addInput(numRecords.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReaderReadUpTo(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReset.java
index a96b6a75468..697f0bf388b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReset.java
@@ -53,9 +53,8 @@ private ReaderReset(Operation operation) {
       describeByClass = true
   )
   public static ReaderReset create(Scope scope, Operand<? extends TType> readerHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderReset"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReaderReset");
     opBuilder.addInput(readerHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReaderReset(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRestoreState.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRestoreState.java
index 23f64953497..838df56eaf8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRestoreState.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRestoreState.java
@@ -59,10 +59,9 @@ private ReaderRestoreState(Operation operation) {
   )
   public static ReaderRestoreState create(Scope scope, Operand<? extends TType> readerHandle,
       Operand<TString> state) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderRestoreState"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReaderRestoreState");
     opBuilder.addInput(readerHandle.asOutput());
     opBuilder.addInput(state.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReaderRestoreState(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderSerializeState.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderSerializeState.java
index c996d0d7d8d..486eddbb5ef 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderSerializeState.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderSerializeState.java
@@ -61,9 +61,8 @@ private ReaderSerializeState(Operation operation) {
       describeByClass = true
   )
   public static ReaderSerializeState create(Scope scope, Operand<? extends TType> readerHandle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderSerializeState"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReaderSerializeState");
     opBuilder.addInput(readerHandle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReaderSerializeState(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java
index a47ed876db2..94ffbca759e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java
@@ -76,11 +76,10 @@ private SerializeManySparse(Operation operation) {
   public static <U extends TType> SerializeManySparse<U> create(Scope scope,
       Operand<TInt64> sparseIndices, Operand<? extends TType> sparseValues,
       Operand<TInt64> sparseShape, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SerializeManySparse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SerializeManySparse");
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
     opBuilder.addInput(sparseShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new SerializeManySparse<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java
index dec5fd1eeb9..65f33687722 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java
@@ -70,11 +70,10 @@ private SerializeSparse(Operation operation) {
   public static <U extends TType> SerializeSparse<U> create(Scope scope,
       Operand<TInt64> sparseIndices, Operand<? extends TType> sparseValues,
       Operand<TInt64> sparseShape, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SerializeSparse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SerializeSparse");
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
     opBuilder.addInput(sparseShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new SerializeSparse<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java
index 2d7dbecabee..78518c5ae50 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java
@@ -59,9 +59,8 @@ private SerializeTensor(Operation operation) {
       describeByClass = true
   )
   public static SerializeTensor create(Scope scope, Operand<? extends TType> tensor) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SerializeTensor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SerializeTensor");
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SerializeTensor(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilename.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilename.java
index 744a34b1329..f762ef77640 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilename.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilename.java
@@ -63,11 +63,10 @@ private ShardedFilename(Operation operation) {
   )
   public static ShardedFilename create(Scope scope, Operand<TString> basename,
       Operand<TInt32> shard, Operand<TInt32> numShards) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShardedFilename"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ShardedFilename");
     opBuilder.addInput(basename.asOutput());
     opBuilder.addInput(shard.asOutput());
     opBuilder.addInput(numShards.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ShardedFilename(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilespec.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilespec.java
index 8b369b037c0..933d0e45f36 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilespec.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilespec.java
@@ -61,10 +61,9 @@ private ShardedFilespec(Operation operation) {
   )
   public static ShardedFilespec create(Scope scope, Operand<TString> basename,
       Operand<TInt32> numShards) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShardedFilespec"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ShardedFilespec");
     opBuilder.addInput(basename.asOutput());
     opBuilder.addInput(numShards.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ShardedFilespec(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TextLineReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TextLineReader.java
index 136a4b7364d..6fa1e3c7065 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TextLineReader.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TextLineReader.java
@@ -59,8 +59,7 @@ private TextLineReader(Operation operation) {
       describeByClass = true
   )
   public static TextLineReader create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TextLineReader"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TextLineReader");
     if (options != null) {
       for (Options opts : options) {
         if (opts.skipHeaderLines != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TfRecordReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TfRecordReader.java
index 8e8ca9daf9e..b587c0915da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TfRecordReader.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TfRecordReader.java
@@ -59,8 +59,7 @@ private TfRecordReader(Operation operation) {
       describeByClass = true
   )
   public static TfRecordReader create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TfRecordReader"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TfRecordReader");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WholeFileReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WholeFileReader.java
index 8c14d1b103b..862983e5cb1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WholeFileReader.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WholeFileReader.java
@@ -61,8 +61,7 @@ private WholeFileReader(Operation operation) {
       describeByClass = true
   )
   public static WholeFileReader create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WholeFileReader"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WholeFileReader");
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WriteFile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WriteFile.java
index 28c66faab20..28fd7ee6335 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WriteFile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WriteFile.java
@@ -56,10 +56,9 @@ private WriteFile(Operation operation) {
   )
   public static WriteFile create(Scope scope, Operand<TString> filename,
       Operand<TString> contents) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteFile"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WriteFile");
     opBuilder.addInput(filename.asOutput());
     opBuilder.addInput(contents.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new WriteFile(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandPart.java
index 77f4ac33b9b..f43a48cb7ef 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandPart.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandPart.java
@@ -97,11 +97,10 @@ private BandPart(Operation operation) {
   )
   public static <T extends TType, U extends TNumber> BandPart<T> create(Scope scope,
       Operand<T> input, Operand<U> numLower, Operand<U> numUpper) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BandPart"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BandPart");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(numLower.asOutput());
     opBuilder.addInput(numUpper.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BandPart<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandedTriangularSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandedTriangularSolve.java
index 144660c2053..77d9642ffed 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandedTriangularSolve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandedTriangularSolve.java
@@ -60,10 +60,9 @@ private BandedTriangularSolve(Operation operation) {
   )
   public static <T extends TType> BandedTriangularSolve<T> create(Scope scope, Operand<T> matrix,
       Operand<T> rhs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BandedTriangularSolve"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BandedTriangularSolve");
     opBuilder.addInput(matrix.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.lower != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholesky.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholesky.java
index 9be5326dbf3..11f03e8d543 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholesky.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholesky.java
@@ -61,9 +61,8 @@ private BatchCholesky(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BatchCholesky<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchCholesky"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchCholesky");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchCholesky<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholeskyGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholeskyGrad.java
index 52f1bef7273..e7554b4a92b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholeskyGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholeskyGrad.java
@@ -63,10 +63,9 @@ private BatchCholeskyGrad(Operation operation) {
   )
   public static <T extends TNumber> BatchCholeskyGrad<T> create(Scope scope, Operand<T> l,
       Operand<T> grad) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchCholeskyGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchCholeskyGrad");
     opBuilder.addInput(l.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchCholeskyGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixBandPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixBandPart.java
index bd756ae0cd9..17d71e27f7f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixBandPart.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixBandPart.java
@@ -65,11 +65,10 @@ private BatchMatrixBandPart(Operation operation) {
   )
   public static <T extends TType> BatchMatrixBandPart<T> create(Scope scope, Operand<T> input,
       Operand<TInt64> numLower, Operand<TInt64> numUpper) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixBandPart"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixBandPart");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(numLower.asOutput());
     opBuilder.addInput(numUpper.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchMatrixBandPart<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDeterminant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDeterminant.java
index f5f06c0557e..d0d15d8d22a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDeterminant.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDeterminant.java
@@ -61,9 +61,8 @@ private BatchMatrixDeterminant(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> BatchMatrixDeterminant<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixDeterminant"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixDeterminant");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchMatrixDeterminant<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiag.java
index e79c4e6359a..a8af1f6cfba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiag.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiag.java
@@ -61,9 +61,8 @@ private BatchMatrixDiag(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> BatchMatrixDiag<T> create(Scope scope, Operand<T> diagonal) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixDiag"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixDiag");
     opBuilder.addInput(diagonal.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchMatrixDiag<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiagPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiagPart.java
index 068e42fc02d..c3de49e9c75 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiagPart.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiagPart.java
@@ -61,9 +61,8 @@ private BatchMatrixDiagPart(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> BatchMatrixDiagPart<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixDiagPart"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixDiagPart");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchMatrixDiagPart<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixInverse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixInverse.java
index d50d411971a..ffaf294076d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixInverse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixInverse.java
@@ -63,9 +63,8 @@ private BatchMatrixInverse(Operation operation) {
   )
   public static <T extends TNumber> BatchMatrixInverse<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixInverse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixInverse");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.adjoint != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSetDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSetDiag.java
index dc02831a296..ea3e2277b38 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSetDiag.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSetDiag.java
@@ -63,10 +63,9 @@ private BatchMatrixSetDiag(Operation operation) {
   )
   public static <T extends TType> BatchMatrixSetDiag<T> create(Scope scope, Operand<T> input,
       Operand<T> diagonal) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixSetDiag"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixSetDiag");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(diagonal.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchMatrixSetDiag<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolve.java
index 9170246b78f..896451d0c58 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolve.java
@@ -64,10 +64,9 @@ private BatchMatrixSolve(Operation operation) {
   )
   public static <T extends TNumber> BatchMatrixSolve<T> create(Scope scope, Operand<T> matrix,
       Operand<T> rhs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixSolve"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixSolve");
     opBuilder.addInput(matrix.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.adjoint != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolveLs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolveLs.java
index cd8011f1d83..cfe318269e2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolveLs.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolveLs.java
@@ -66,11 +66,10 @@ private BatchMatrixSolveLs(Operation operation) {
   )
   public static <T extends TNumber> BatchMatrixSolveLs<T> create(Scope scope, Operand<T> matrix,
       Operand<T> rhs, Operand<TFloat64> l2Regularizer, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixSolveLs"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixSolveLs");
     opBuilder.addInput(matrix.asOutput());
     opBuilder.addInput(rhs.asOutput());
     opBuilder.addInput(l2Regularizer.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.fast != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixTriangularSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixTriangularSolve.java
index ae3023e22a3..a52a7ce9c9e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixTriangularSolve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixTriangularSolve.java
@@ -64,10 +64,9 @@ private BatchMatrixTriangularSolve(Operation operation) {
   )
   public static <T extends TNumber> BatchMatrixTriangularSolve<T> create(Scope scope,
       Operand<T> matrix, Operand<T> rhs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixTriangularSolve"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatrixTriangularSolve");
     opBuilder.addInput(matrix.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.lower != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSelfAdjointEig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSelfAdjointEig.java
index bf624b3668e..3bc1baa374d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSelfAdjointEig.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSelfAdjointEig.java
@@ -66,9 +66,8 @@ private BatchSelfAdjointEig(Operation operation) {
   )
   public static <T extends TNumber> BatchSelfAdjointEig<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchSelfAdjointEig"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchSelfAdjointEig");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.computeV != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSvd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSvd.java
index 3ef2cb277df..e52f57dc8b4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSvd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSvd.java
@@ -69,9 +69,8 @@ private BatchSvd(Operation operation) {
   )
   public static <T extends TType> BatchSvd<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchSvd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchSvd");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.computeUv != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cholesky.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cholesky.java
index ab4ee760183..655831f5ebb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cholesky.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cholesky.java
@@ -71,9 +71,8 @@ private Cholesky(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Cholesky<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cholesky"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Cholesky");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Cholesky<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/CholeskyGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/CholeskyGrad.java
index dcd90da3041..f66f879332f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/CholeskyGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/CholeskyGrad.java
@@ -69,10 +69,9 @@ private CholeskyGrad(Operation operation) {
   )
   public static <T extends TNumber> CholeskyGrad<T> create(Scope scope, Operand<T> l,
       Operand<T> grad) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CholeskyGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CholeskyGrad");
     opBuilder.addInput(l.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new CholeskyGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java
index 0bbcbbb88d3..98618b9e7b7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java
@@ -67,10 +67,9 @@ private ConjugateTranspose(Operation operation) {
   )
   public static <T extends TType> ConjugateTranspose<T> create(Scope scope, Operand<T> x,
       Operand<? extends TNumber> perm) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConjugateTranspose"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ConjugateTranspose");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(perm.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ConjugateTranspose<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cross.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cross.java
index 3a61a137e51..537c6cdcb48 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cross.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cross.java
@@ -65,10 +65,9 @@ private Cross(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Cross<T> create(Scope scope, Operand<T> a, Operand<T> b) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cross"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Cross");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Cross<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Det.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Det.java
index 7047cb8d97f..0fb44b629a9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Det.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Det.java
@@ -64,9 +64,8 @@ private Det(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Det<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Det"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Det");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Det<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java
index b1cce520076..0a38377eb0c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java
@@ -78,9 +78,8 @@ private Eig(Operation operation) {
   )
   public static <U extends TType> Eig<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> Tout, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Eig"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Eig");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Einsum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Einsum.java
index 51ff55b64a7..b95c42f015e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Einsum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Einsum.java
@@ -127,9 +127,8 @@ private Einsum(Operation operation) {
   )
   public static <T extends TType> Einsum<T> create(Scope scope, Iterable<Operand<T>> inputs,
       String equation) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Einsum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Einsum");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("equation", equation);
     return new Einsum<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java
index 911650b50ea..3128f30a34d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java
@@ -70,10 +70,9 @@ private EuclideanNorm(Operation operation) {
   )
   public static <T extends TType> EuclideanNorm<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EuclideanNorm"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EuclideanNorm");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Inv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Inv.java
index 67f6ab7895f..7c8e91dbe9a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Inv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Inv.java
@@ -69,9 +69,8 @@ private Inv(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Inv<T> create(Scope scope, Operand<T> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Inv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Inv");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.adjoint != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LoadAndRemapMatrix.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LoadAndRemapMatrix.java
index f7e1d8214c4..3f6396dfa99 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LoadAndRemapMatrix.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LoadAndRemapMatrix.java
@@ -106,13 +106,12 @@ private LoadAndRemapMatrix(Operation operation) {
   public static LoadAndRemapMatrix create(Scope scope, Operand<TString> ckptPath,
       Operand<TString> oldTensorName, Operand<TInt64> rowRemapping, Operand<TInt64> colRemapping,
       Operand<TFloat32> initializingValues, Long numRows, Long numCols, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadAndRemapMatrix"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadAndRemapMatrix");
     opBuilder.addInput(ckptPath.asOutput());
     opBuilder.addInput(oldTensorName.asOutput());
     opBuilder.addInput(rowRemapping.asOutput());
     opBuilder.addInput(colRemapping.asOutput());
     opBuilder.addInput(initializingValues.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_rows", numRows);
     opBuilder.setAttr("num_cols", numCols);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LogMatrixDeterminant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LogMatrixDeterminant.java
index a5374bb74f7..d1b62eae3d3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LogMatrixDeterminant.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LogMatrixDeterminant.java
@@ -72,9 +72,8 @@ private LogMatrixDeterminant(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> LogMatrixDeterminant<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogMatrixDeterminant"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LogMatrixDeterminant");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LogMatrixDeterminant<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Lu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Lu.java
index 69be99d1411..5cd692a71bc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Lu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Lu.java
@@ -86,9 +86,8 @@ private Lu(Operation operation) {
   )
   public static <T extends TType, U extends TNumber> Lu<T, U> create(Scope scope, Operand<T> input,
       Class<U> outputIdxType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Lu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Lu");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_idx_type", Operands.toDataType(outputIdxType));
     return new Lu<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatMul.java
index 5e67b7a3c4d..a0269b20948 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatMul.java
@@ -70,10 +70,9 @@ private MatMul(Operation operation) {
   )
   public static <T extends TType> MatMul<T> create(Scope scope, Operand<T> a, Operand<T> b,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatMul");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.transposeA != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiag.java
index cf9a8b9b4f9..74e7289ba2d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiag.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiag.java
@@ -156,13 +156,12 @@ private MatrixDiag(Operation operation) {
   public static <T extends TType> MatrixDiag<T> create(Scope scope, Operand<T> diagonal,
       Operand<TInt32> k, Operand<TInt32> numRows, Operand<TInt32> numCols,
       Operand<T> paddingValue) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixDiag"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatrixDiag");
     opBuilder.addInput(diagonal.asOutput());
     opBuilder.addInput(k.asOutput());
     opBuilder.addInput(numRows.asOutput());
     opBuilder.addInput(numCols.asOutput());
     opBuilder.addInput(paddingValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MatrixDiag<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPart.java
index 4e61470cebd..6bde824a10a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPart.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPart.java
@@ -129,11 +129,10 @@ private MatrixDiagPart(Operation operation) {
   )
   public static <T extends TType> MatrixDiagPart<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> k, Operand<T> paddingValue) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixDiagPart"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatrixDiagPart");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(k.asOutput());
     opBuilder.addInput(paddingValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MatrixDiagPart<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPartV3.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPartV3.java
index 53c442dfb66..7039e1e4abc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPartV3.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPartV3.java
@@ -160,11 +160,10 @@ private MatrixDiagPartV3(Operation operation) {
   )
   public static <T extends TType> MatrixDiagPartV3<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> k, Operand<T> paddingValue, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixDiagPartV3"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatrixDiagPartV3");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(k.asOutput());
     opBuilder.addInput(paddingValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.align != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagV3.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagV3.java
index 22b39d750d9..9a812c4504f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagV3.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagV3.java
@@ -185,13 +185,12 @@ private MatrixDiagV3(Operation operation) {
   public static <T extends TType> MatrixDiagV3<T> create(Scope scope, Operand<T> diagonal,
       Operand<TInt32> k, Operand<TInt32> numRows, Operand<TInt32> numCols, Operand<T> paddingValue,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixDiagV3"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatrixDiagV3");
     opBuilder.addInput(diagonal.asOutput());
     opBuilder.addInput(k.asOutput());
     opBuilder.addInput(numRows.asOutput());
     opBuilder.addInput(numCols.asOutput());
     opBuilder.addInput(paddingValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.align != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixLogarithm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixLogarithm.java
index 7d6f981d59c..822ba52caa7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixLogarithm.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixLogarithm.java
@@ -68,9 +68,8 @@ private MatrixLogarithm(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> MatrixLogarithm<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixLogarithm"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatrixLogarithm");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MatrixLogarithm<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSetDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSetDiag.java
index 041fc78abab..7cf8c61e559 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSetDiag.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSetDiag.java
@@ -166,11 +166,10 @@ private MatrixSetDiag(Operation operation) {
   )
   public static <T extends TType> MatrixSetDiag<T> create(Scope scope, Operand<T> input,
       Operand<T> diagonal, Operand<TInt32> k, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixSetDiag"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatrixSetDiag");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(diagonal.asOutput());
     opBuilder.addInput(k.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.align != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSolveLs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSolveLs.java
index c838da66ca4..f3cf21c2138 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSolveLs.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSolveLs.java
@@ -99,11 +99,10 @@ private MatrixSolveLs(Operation operation) {
   )
   public static <T extends TType> MatrixSolveLs<T> create(Scope scope, Operand<T> matrix,
       Operand<T> rhs, Operand<TFloat64> l2Regularizer, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixSolveLs"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MatrixSolveLs");
     opBuilder.addInput(matrix.asOutput());
     opBuilder.addInput(rhs.asOutput());
     opBuilder.addInput(l2Regularizer.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.fast != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Qr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Qr.java
index bb0276b4fef..02839271a61 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Qr.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Qr.java
@@ -78,9 +78,8 @@ private Qr(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Qr<T> create(Scope scope, Operand<T> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Qr"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Qr");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.fullMatrices != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java
index 87131aada14..3f8fae35715 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java
@@ -86,14 +86,13 @@ public static <V extends TNumber, W extends TNumber> QuantizedMatMul<V> create(S
       Operand<? extends TNumber> a, Operand<? extends TNumber> b, Operand<TFloat32> minA,
       Operand<TFloat32> maxA, Operand<TFloat32> minB, Operand<TFloat32> maxB, Class<V> Toutput,
       Class<W> Tactivation, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedMatMul");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
     opBuilder.addInput(minA.asOutput());
     opBuilder.addInput(maxA.asOutput());
     opBuilder.addInput(minB.asOutput());
     opBuilder.addInput(maxB.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     opBuilder.setAttr("Tactivation", Operands.toDataType(Tactivation));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java
index ae37f39c042..c7af6356a65 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java
@@ -83,7 +83,7 @@ public static <W extends TNumber> QuantizedMatMulWithBias<W> create(Scope scope,
       Operand<? extends TNumber> a, Operand<? extends TNumber> b, Operand<? extends TNumber> bias,
       Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB,
       Operand<TFloat32> maxB, Class<W> Toutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBias"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedMatMulWithBias");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -91,7 +91,6 @@ public static <W extends TNumber> QuantizedMatMulWithBias<W> create(Scope scope,
     opBuilder.addInput(maxA.asOutput());
     opBuilder.addInput(minB.asOutput());
     opBuilder.addInput(maxB.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java
index b5a9c0adb82..7b5d8f0d05f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java
@@ -84,7 +84,7 @@ public static <V extends TNumber> QuantizedMatMulWithBiasAndRelu<V> create(Scope
       Operand<? extends TNumber> a, Operand<? extends TNumber> b, Operand<TFloat32> bias,
       Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB,
       Operand<TFloat32> maxB, Class<V> Toutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBiasAndRelu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedMatMulWithBiasAndRelu");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -92,7 +92,6 @@ public static <V extends TNumber> QuantizedMatMulWithBiasAndRelu<V> create(Scope
     opBuilder.addInput(maxA.asOutput());
     opBuilder.addInput(minB.asOutput());
     opBuilder.addInput(maxB.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java
index 4d53f20eab9..22e29864166 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java
@@ -88,7 +88,7 @@ public static <W extends TNumber> QuantizedMatMulWithBiasAndReluAndRequantize<W>
       Operand<? extends TNumber> bias, Operand<TFloat32> minA, Operand<TFloat32> maxA,
       Operand<TFloat32> minB, Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput,
       Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBiasAndReluAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedMatMulWithBiasAndReluAndRequantize");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -98,7 +98,6 @@ public static <W extends TNumber> QuantizedMatMulWithBiasAndReluAndRequantize<W>
     opBuilder.addInput(maxB.asOutput());
     opBuilder.addInput(minFreezedOutput.asOutput());
     opBuilder.addInput(maxFreezedOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/SelfAdjointEig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/SelfAdjointEig.java
index 51415f87a2c..d2c93e69887 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/SelfAdjointEig.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/SelfAdjointEig.java
@@ -76,9 +76,8 @@ private SelfAdjointEig(Operation operation) {
   )
   public static <T extends TType> SelfAdjointEig<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SelfAdjointEig"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SelfAdjointEig");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.computeV != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Solve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Solve.java
index b6eb29e4857..42731f6edf4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Solve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Solve.java
@@ -70,10 +70,9 @@ private Solve(Operation operation) {
   )
   public static <T extends TType> Solve<T> create(Scope scope, Operand<T> matrix, Operand<T> rhs,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Solve"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Solve");
     opBuilder.addInput(matrix.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.adjoint != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Sqrtm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Sqrtm.java
index cfff7ae9494..9dfa820a4da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Sqrtm.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Sqrtm.java
@@ -73,9 +73,8 @@ private Sqrtm(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Sqrtm<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sqrtm"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sqrtm");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Sqrtm<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Svd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Svd.java
index 5f1328bdfa7..2314f25ec56 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Svd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Svd.java
@@ -79,9 +79,8 @@ private Svd(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Svd<T> create(Scope scope, Operand<T> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Svd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Svd");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.computeUv != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiag.java
index 093c4c7e27a..5a4037cd396 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiag.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiag.java
@@ -74,9 +74,8 @@ private TensorDiag(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> TensorDiag<T> create(Scope scope, Operand<T> diagonal) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorDiag"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorDiag");
     opBuilder.addInput(diagonal.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorDiag<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiagPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiagPart.java
index 42dc603d1f5..ddcc97d638b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiagPart.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiagPart.java
@@ -75,9 +75,8 @@ private TensorDiagPart(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> TensorDiagPart<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorDiagPart"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorDiagPart");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorDiagPart<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java
index 46703ae3a66..1df128d376d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java
@@ -66,10 +66,9 @@ private Transpose(Operation operation) {
   )
   public static <T extends TType> Transpose<T> create(Scope scope, Operand<T> x,
       Operand<? extends TNumber> perm) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Transpose"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Transpose");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(perm.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Transpose<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TriangularSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TriangularSolve.java
index b2a0047efbc..6b44f83ab59 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TriangularSolve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TriangularSolve.java
@@ -106,10 +106,9 @@ private TriangularSolve(Operation operation) {
   )
   public static <T extends TType> TriangularSolve<T> create(Scope scope, Operand<T> matrix,
       Operand<T> rhs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TriangularSolve"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TriangularSolve");
     opBuilder.addInput(matrix.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.lower != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalMatMul.java
index d15c3c7f7fe..a43a50262a2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalMatMul.java
@@ -66,12 +66,11 @@ private TridiagonalMatMul(Operation operation) {
   )
   public static <T extends TType> TridiagonalMatMul<T> create(Scope scope, Operand<T> superdiag,
       Operand<T> maindiag, Operand<T> subdiag, Operand<T> rhs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TridiagonalMatMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TridiagonalMatMul");
     opBuilder.addInput(superdiag.asOutput());
     opBuilder.addInput(maindiag.asOutput());
     opBuilder.addInput(subdiag.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TridiagonalMatMul<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalSolve.java
index 04f5d95a4cb..da22a9d990e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalSolve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalSolve.java
@@ -71,15 +71,17 @@ private TridiagonalSolve(Operation operation) {
   )
   public static <T extends TType> TridiagonalSolve<T> create(Scope scope, Operand<T> diagonals,
       Operand<T> rhs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TridiagonalSolve"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TridiagonalSolve");
     opBuilder.addInput(diagonals.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.partialPivoting != null) {
           opBuilder.setAttr("partial_pivoting", opts.partialPivoting);
         }
+        if (opts.perturbSingular != null) {
+          opBuilder.setAttr("perturb_singular", opts.perturbSingular);
+        }
       }
     }
     return new TridiagonalSolve<>(opBuilder.build());
@@ -96,6 +98,16 @@ public static Options partialPivoting(Boolean partialPivoting) {
     return new Options().partialPivoting(partialPivoting);
   }
 
+  /**
+   * Sets the perturbSingular option.
+   *
+   * @param perturbSingular the perturbSingular option
+   * @return this Options instance.
+   */
+  public static Options perturbSingular(Boolean perturbSingular) {
+    return new Options().perturbSingular(perturbSingular);
+  }
+
   /**
    * Gets output.
    * Tensor of shape {@code [..., M, K]} containing the solutions
@@ -116,6 +128,8 @@ public Output<T> asOutput() {
   public static class Options {
     private Boolean partialPivoting;
 
+    private Boolean perturbSingular;
+
     private Options() {
     }
 
@@ -130,5 +144,16 @@ public Options partialPivoting(Boolean partialPivoting) {
       this.partialPivoting = partialPivoting;
       return this;
     }
+
+    /**
+     * Sets the perturbSingular option.
+     *
+     * @param perturbSingular the perturbSingular option
+     * @return this Options instance.
+     */
+    public Options perturbSingular(Boolean perturbSingular) {
+      this.perturbSingular = perturbSingular;
+      return this;
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixComponents.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixComponents.java
index cab58a5bb71..ed9ea8f002d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixComponents.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixComponents.java
@@ -70,10 +70,9 @@ private CSRSparseMatrixComponents(Operation operation) {
   )
   public static <T extends TType> CSRSparseMatrixComponents<T> create(Scope scope,
       Operand<? extends TType> csrSparseMatrix, Operand<TInt32> index, Class<T> type) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSRSparseMatrixComponents"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CSRSparseMatrixComponents");
     opBuilder.addInput(csrSparseMatrix.asOutput());
     opBuilder.addInput(index.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     return new CSRSparseMatrixComponents<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToDense.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToDense.java
index cb992b01b6f..1eab3760775 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToDense.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToDense.java
@@ -60,9 +60,8 @@ private CSRSparseMatrixToDense(Operation operation) {
   )
   public static <T extends TType> CSRSparseMatrixToDense<T> create(Scope scope,
       Operand<? extends TType> sparseInput, Class<T> type) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSRSparseMatrixToDense"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CSRSparseMatrixToDense");
     opBuilder.addInput(sparseInput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     return new CSRSparseMatrixToDense<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToSparseTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToSparseTensor.java
index 0fa5e61e95c..ec0efb39f90 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToSparseTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToSparseTensor.java
@@ -67,9 +67,8 @@ private CSRSparseMatrixToSparseTensor(Operation operation) {
   )
   public static <T extends TType> CSRSparseMatrixToSparseTensor<T> create(Scope scope,
       Operand<? extends TType> sparseMatrix, Class<T> type) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSRSparseMatrixToSparseTensor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CSRSparseMatrixToSparseTensor");
     opBuilder.addInput(sparseMatrix.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     return new CSRSparseMatrixToSparseTensor<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java
index 85698b15126..e1d3794be5a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java
@@ -58,10 +58,9 @@ private DenseToCSRSparseMatrix(Operation operation) {
   )
   public static DenseToCSRSparseMatrix create(Scope scope, Operand<? extends TType> denseInput,
       Operand<TInt64> indices) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToCSRSparseMatrix"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DenseToCSRSparseMatrix");
     opBuilder.addInput(denseInput.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DenseToCSRSparseMatrix(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixAdd.java
index 4a27f1c657e..2dbacec3ded 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixAdd.java
@@ -62,12 +62,11 @@ private SparseMatrixAdd(Operation operation) {
   )
   public static <T extends TType> SparseMatrixAdd create(Scope scope, Operand<? extends TType> a,
       Operand<? extends TType> b, Operand<T> alpha, Operand<T> beta) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixAdd");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
     opBuilder.addInput(alpha.asOutput());
     opBuilder.addInput(beta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseMatrixAdd(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMatMul.java
index dba8e84ea2e..c59e026a0a5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMatMul.java
@@ -81,10 +81,9 @@ private SparseMatrixMatMul(Operation operation) {
   )
   public static <T extends TType> SparseMatrixMatMul<T> create(Scope scope,
       Operand<? extends TType> a, Operand<T> b, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixMatMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixMatMul");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.transposeA != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java
index 1c276673459..bfe5470377b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java
@@ -63,10 +63,9 @@ private SparseMatrixMul(Operation operation) {
   )
   public static SparseMatrixMul create(Scope scope, Operand<? extends TType> a,
       Operand<? extends TType> b) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixMul");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseMatrixMul(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixNNZ.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixNNZ.java
index 8522899df3e..ec8f88c871c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixNNZ.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixNNZ.java
@@ -55,9 +55,8 @@ private SparseMatrixNNZ(Operation operation) {
       describeByClass = true
   )
   public static SparseMatrixNNZ create(Scope scope, Operand<? extends TType> sparseMatrix) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixNNZ"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixNNZ");
     opBuilder.addInput(sparseMatrix.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseMatrixNNZ(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixOrderingAMD.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixOrderingAMD.java
index 7e267045538..044f77cd7ea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixOrderingAMD.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixOrderingAMD.java
@@ -96,9 +96,8 @@ private SparseMatrixOrderingAMD(Operation operation) {
       describeByClass = true
   )
   public static SparseMatrixOrderingAMD create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixOrderingAMD"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixOrderingAMD");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseMatrixOrderingAMD(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmax.java
index 339653ff4d2..ff71d3a1e0e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmax.java
@@ -64,9 +64,8 @@ private SparseMatrixSoftmax(Operation operation) {
   )
   public static <T extends TNumber> SparseMatrixSoftmax create(Scope scope,
       Operand<? extends TType> logits, Class<T> type) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixSoftmax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixSoftmax");
     opBuilder.addInput(logits.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     return new SparseMatrixSoftmax(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmaxGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmaxGrad.java
index 390e4b704f5..f5d48cd58d0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmaxGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmaxGrad.java
@@ -61,10 +61,9 @@ private SparseMatrixSoftmaxGrad(Operation operation) {
   )
   public static <T extends TNumber> SparseMatrixSoftmaxGrad create(Scope scope,
       Operand<? extends TType> softmax, Operand<? extends TType> gradSoftmax, Class<T> type) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixSoftmaxGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixSoftmaxGrad");
     opBuilder.addInput(softmax.asOutput());
     opBuilder.addInput(gradSoftmax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     return new SparseMatrixSoftmaxGrad(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseCholesky.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseCholesky.java
index edaab7eb54b..854d7714176 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseCholesky.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseCholesky.java
@@ -125,10 +125,9 @@ private SparseMatrixSparseCholesky(Operation operation) {
   )
   public static <T extends TType> SparseMatrixSparseCholesky create(Scope scope,
       Operand<? extends TType> input, Operand<TInt32> permutation, Class<T> type) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixSparseCholesky"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixSparseCholesky");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(permutation.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     return new SparseMatrixSparseCholesky(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseMatMul.java
index 87995a7e78e..052bcd4aaeb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseMatMul.java
@@ -127,10 +127,9 @@ private SparseMatrixSparseMatMul(Operation operation) {
   )
   public static <T extends TType> SparseMatrixSparseMatMul create(Scope scope,
       Operand<? extends TType> a, Operand<? extends TType> b, Class<T> type, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixSparseMatMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixSparseMatMul");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixTranspose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixTranspose.java
index 8ad12d3289e..510d784415f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixTranspose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixTranspose.java
@@ -62,9 +62,8 @@ private SparseMatrixTranspose(Operation operation) {
   )
   public static <T extends TType> SparseMatrixTranspose create(Scope scope,
       Operand<? extends TType> input, Class<T> type, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixTranspose"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixTranspose");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixZeros.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixZeros.java
index e7f0a48e1aa..13439e2a49e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixZeros.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixZeros.java
@@ -60,9 +60,8 @@ private SparseMatrixZeros(Operation operation) {
   )
   public static <T extends TType> SparseMatrixZeros create(Scope scope, Operand<TInt64> denseShape,
       Class<T> type) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixZeros"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatrixZeros");
     opBuilder.addInput(denseShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("type", Operands.toDataType(type));
     return new SparseMatrixZeros(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java
index 12f27f6ebea..b9d3aebaa6e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java
@@ -59,11 +59,10 @@ private SparseTensorToCSRSparseMatrix(Operation operation) {
   )
   public static SparseTensorToCSRSparseMatrix create(Scope scope, Operand<TInt64> indices,
       Operand<? extends TType> values, Operand<TInt64> denseShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseTensorToCSRSparseMatrix"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseTensorToCSRSparseMatrix");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(denseShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseTensorToCSRSparseMatrix(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Abs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Abs.java
index 249b2567578..e18c875dc03 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Abs.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Abs.java
@@ -64,9 +64,8 @@ private Abs(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Abs<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Abs"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Abs");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Abs<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AccumulateN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AccumulateN.java
index 2e314a940b0..ecdb5d78af9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AccumulateN.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AccumulateN.java
@@ -71,9 +71,8 @@ private AccumulateN(Operation operation) {
   )
   public static <T extends TType> AccumulateN<T> create(Scope scope, Iterable<Operand<T>> inputs,
       Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulateN"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AccumulateN");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("shape", shape);
     return new AccumulateN<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acos.java
index 063b23c388a..bf83134db52 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acos.java
@@ -63,9 +63,8 @@ private Acos(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Acos<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Acos"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Acos");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Acos<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acosh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acosh.java
index 37594adbbf2..f8324e7bf17 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acosh.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acosh.java
@@ -67,9 +67,8 @@ private Acosh(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Acosh<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Acosh"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Acosh");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Acosh<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Add.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Add.java
index a1269762893..ef34ca94ba9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Add.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Add.java
@@ -66,10 +66,9 @@ private Add(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Add<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Add"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Add");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Add<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AddN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AddN.java
index 664e648d2ab..9968751c73d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AddN.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AddN.java
@@ -67,9 +67,8 @@ private AddN(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> AddN<T> create(Scope scope, Iterable<Operand<T>> inputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AddN"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AddN");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     return new AddN<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java
index 7f251ea8f65..85c68982edf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java
@@ -79,9 +79,8 @@ private Angle(Operation operation) {
   )
   public static <U extends TNumber> Angle<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> Tout) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Angle"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Angle");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     return new Angle<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ApproximateEqual.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ApproximateEqual.java
index 43972eefec5..0ff28f5272f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ApproximateEqual.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ApproximateEqual.java
@@ -63,10 +63,9 @@ private ApproximateEqual(Operation operation) {
   )
   public static <T extends TType> ApproximateEqual create(Scope scope, Operand<T> x, Operand<T> y,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApproximateEqual"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApproximateEqual");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.tolerance != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java
index 5e66b0e5077..48709c643ab 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java
@@ -79,10 +79,9 @@ private ArgMax(Operation operation) {
   )
   public static <V extends TNumber> ArgMax<V> create(Scope scope, Operand<? extends TType> input,
       Operand<? extends TNumber> dimension, Class<V> outputType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ArgMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ArgMax");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(dimension.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_type", Operands.toDataType(outputType));
     return new ArgMax<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java
index d477cc981a0..fc75352c9a7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java
@@ -79,10 +79,9 @@ private ArgMin(Operation operation) {
   )
   public static <V extends TNumber> ArgMin<V> create(Scope scope, Operand<? extends TType> input,
       Operand<? extends TNumber> dimension, Class<V> outputType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ArgMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ArgMin");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(dimension.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_type", Operands.toDataType(outputType));
     return new ArgMin<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asin.java
index d3f30e93021..ee04e8cf388 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asin.java
@@ -73,9 +73,8 @@ private Asin(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Asin<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Asin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Asin");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Asin<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asinh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asinh.java
index b9e925d448a..0119bd153bc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asinh.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asinh.java
@@ -68,9 +68,8 @@ private Asinh(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Asinh<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Asinh"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Asinh");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Asinh<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan.java
index ca2794cd466..23d406fc212 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan.java
@@ -73,9 +73,8 @@ private Atan(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Atan<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Atan"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Atan");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Atan<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan2.java
index d89e5ab0e09..ce96908dcde 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan2.java
@@ -29,11 +29,22 @@
 
 /**
  * Computes arctangent of {@code y/x} element-wise, respecting signs of the arguments.
- * This is the angle ( \theta \in [-\pi, \pi] ) such that
- * [ x = r \cos(\theta) ]
+ * This is the angle \( \theta \in [-\pi, \pi] \) such that
+ * \[ x = r \cos(\theta) \]
  * and
- * [ y = r \sin(\theta) ]
- * where (r = \sqrt(x^2 + y^2) ).
+ * \[ y = r \sin(\theta) \]
+ * where \(r = \sqrt{x^2 + y^2} \).
+ * <p>For example:
+ * <blockquote>
+ * <blockquote>
+ * <blockquote>
+ * <p>x = [1., 1.]
+ * y = [1., -1.]
+ * print((tf.math.atan2(y,x) * (180 / np.pi)).numpy())
+ * [ 45. -45.]
+ * </blockquote>
+ * </blockquote>
+ * </blockquote>
  *
  * @param <T> data type for {@code z} output
  */
@@ -67,10 +78,9 @@ private Atan2(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Atan2<T> create(Scope scope, Operand<T> y, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Atan2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Atan2");
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Atan2<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atanh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atanh.java
index 69467ed3e57..044b5024ce0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atanh.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atanh.java
@@ -70,9 +70,8 @@ private Atanh(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Atanh<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Atanh"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Atanh");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Atanh<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0.java
index 455e0d56b2c..35381f86ecc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0.java
@@ -57,9 +57,8 @@ private BesselI0(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselI0<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselI0"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselI0");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselI0<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0e.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0e.java
index f5d69b5ab87..5aaf7dc071b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0e.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0e.java
@@ -57,9 +57,8 @@ private BesselI0e(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselI0e<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselI0e"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselI0e");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselI0e<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1.java
index a31a2245a90..48be4da8852 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1.java
@@ -57,9 +57,8 @@ private BesselI1(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselI1<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselI1"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselI1");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselI1<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1e.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1e.java
index 181f9738b63..86c91135186 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1e.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1e.java
@@ -57,9 +57,8 @@ private BesselI1e(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselI1e<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselI1e"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselI1e");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselI1e<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Betainc.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Betainc.java
index ca2b90c3976..12a6deebcb8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Betainc.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Betainc.java
@@ -70,11 +70,10 @@ private Betainc(Operation operation) {
   )
   public static <T extends TNumber> Betainc<T> create(Scope scope, Operand<T> a, Operand<T> b,
       Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Betainc"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Betainc");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Betainc<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Bincount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Bincount.java
index ad4b7beca9b..e5c3df77bb5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Bincount.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Bincount.java
@@ -73,11 +73,10 @@ private Bincount(Operation operation) {
   )
   public static <T extends TNumber> Bincount<T> create(Scope scope, Operand<TInt32> arr,
       Operand<TInt32> sizeOutput, Operand<T> weights) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Bincount"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Bincount");
     opBuilder.addInput(arr.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(weights.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Bincount<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ceil.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ceil.java
index 0f2d592a623..9b811445925 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ceil.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ceil.java
@@ -61,9 +61,8 @@ private Ceil(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Ceil<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ceil"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Ceil");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Ceil<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CompareAndBitpack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CompareAndBitpack.java
deleted file mode 100644
index f3330443424..00000000000
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CompareAndBitpack.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-=======================================================================*/
-
-// This class has been generated, DO NOT EDIT!
-
-package org.tensorflow.op.math;
-
-import org.tensorflow.Operand;
-import org.tensorflow.Operation;
-import org.tensorflow.OperationBuilder;
-import org.tensorflow.Output;
-import org.tensorflow.op.RawOp;
-import org.tensorflow.op.Scope;
-import org.tensorflow.op.annotation.Endpoint;
-import org.tensorflow.op.annotation.Operator;
-import org.tensorflow.types.TUint8;
-import org.tensorflow.types.family.TType;
-
-/**
- * Compare values of {@code input} to {@code threshold} and pack resulting bits into a {@code uint8}.
- * Each comparison returns a boolean {@code true} (if {@code input_value > threshold})
- * or and {@code false} otherwise.
- * <p>This operation is useful for Locality-Sensitive-Hashing (LSH) and other
- * algorithms that use hashing approximations of cosine and {@code L2} distances;
- * codes can be generated from an input via:
- * <pre>
- * codebook_size = 50
- * codebook_bits = codebook_size * 32
- * codebook = tf.get_variable('codebook', [x.shape[-1].value, codebook_bits],
- *                            dtype=x.dtype,
- *                            initializer=tf.orthogonal_initializer())
- * codes = compare_and_threshold(tf.matmul(x, codebook), threshold=0.)
- * codes = tf.bitcast(codes, tf.int32)  # go from uint8 to int32
- * # now codes has shape x.shape[:-1] + [codebook_size]
- * </pre>
- * <p><strong>NOTE</strong>: Currently, the innermost dimension of the tensor must be divisible
- * by 8.
- * <p>Given an {@code input} shaped {@code [s0, s1, ..., s_n]}, the output is
- * a {@code uint8} tensor shaped {@code [s0, s1, ..., s_n / 8]}.
- */
-@Operator(
-    group = "math"
-)
-public final class CompareAndBitpack extends RawOp implements Operand<TUint8> {
-  /**
-   * The name of this op, as known by TensorFlow core engine
-   */
-  public static final String OP_NAME = "CompareAndBitpack";
-
-  private Output<TUint8> output;
-
-  private CompareAndBitpack(Operation operation) {
-    super(operation);
-    int outputIdx = 0;
-    output = operation.output(outputIdx++);
-  }
-
-  /**
-   * Factory method to create a class wrapping a new CompareAndBitpack operation.
-   *
-   * @param scope current scope
-   * @param input Values to compare against {@code threshold} and bitpack.
-   * @param threshold Threshold to compare against.
-   * @param <T> data type for {@code CompareAndBitpack} output and operands
-   * @return a new instance of CompareAndBitpack
-   */
-  @Endpoint(
-      describeByClass = true
-  )
-  public static <T extends TType> CompareAndBitpack create(Scope scope, Operand<T> input,
-      Operand<T> threshold) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CompareAndBitpack"));
-    opBuilder.addInput(input.asOutput());
-    opBuilder.addInput(threshold.asOutput());
-    opBuilder = scope.apply(opBuilder);
-    return new CompareAndBitpack(opBuilder.build());
-  }
-
-  /**
-   * Gets output.
-   * The bitpacked comparisons.
-   * @return output.
-   */
-  public Output<TUint8> output() {
-    return output;
-  }
-
-  @Override
-  public Output<TUint8> asOutput() {
-    return output;
-  }
-}
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 ba0f1015f54..6e5df44de86 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
@@ -36,6 +36,16 @@
  * {@code float} or {@code double} that is the absolute value of each element in {@code x}. All
  * elements in {@code x} must be complex numbers of the form \(a + bj\). The absolute
  * value is computed as \( \sqrt{a^2 + b^2}\).
+ * <p>For example:
+ * <blockquote>
+ * <blockquote>
+ * <blockquote>
+ * <p>x = tf.complex(3.0, 4.0)
+ * print((tf.raw_ops.ComplexAbs(x=x, Tout=tf.dtypes.float32, name=None)).numpy())
+ * 5.0
+ * </blockquote>
+ * </blockquote>
+ * </blockquote>
  *
  * @param <U> data type for {@code y} output
  */
@@ -70,9 +80,8 @@ private ComplexAbs(Operation operation) {
   )
   public static <U extends TNumber> ComplexAbs<U> create(Scope scope, Operand<? extends TType> x,
       Class<U> Tout) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ComplexAbs"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ComplexAbs");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     return new ComplexAbs<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Conj.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Conj.java
index 504d351b494..cbe6cc9c710 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Conj.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Conj.java
@@ -71,9 +71,8 @@ private Conj(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Conj<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conj"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Conj");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Conj<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cos.java
index d4e329e1cd6..23ce30f2b39 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cos.java
@@ -69,9 +69,8 @@ private Cos(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Cos<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cos"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Cos");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Cos<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cosh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cosh.java
index 7ce9f8ec55a..d47a6e1e490 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cosh.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cosh.java
@@ -68,9 +68,8 @@ private Cosh(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Cosh<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cosh"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Cosh");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Cosh<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java
index 39044e4d6bb..b22b0fb1e72 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java
@@ -88,10 +88,9 @@ private Cumprod(Operation operation) {
   )
   public static <T extends TType> Cumprod<T> create(Scope scope, Operand<T> x,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cumprod"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Cumprod");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.exclusive != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java
index b1e69cd3416..ecc7e3b0aff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java
@@ -88,10 +88,9 @@ private Cumsum(Operation operation) {
   )
   public static <T extends TType> Cumsum<T> create(Scope scope, Operand<T> x,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cumsum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Cumsum");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.exclusive != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java
index 52953db453a..6e98ab061c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java
@@ -77,10 +77,9 @@ private CumulativeLogsumexp(Operation operation) {
   )
   public static <T extends TNumber> CumulativeLogsumexp<T> create(Scope scope, Operand<T> x,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CumulativeLogsumexp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CumulativeLogsumexp");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.exclusive != null) {
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 b58d5cc1c43..6310445901f 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
@@ -74,11 +74,10 @@ private DenseBincount(Operation operation) {
   )
   public static <U extends TNumber, T extends TNumber> DenseBincount<U> create(Scope scope,
       Operand<T> input, Operand<T> sizeOutput, Operand<U> weights, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseBincount"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DenseBincount");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(weights.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.binaryOutput != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Digamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Digamma.java
index 5903fefec40..6e60883e429 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Digamma.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Digamma.java
@@ -62,9 +62,8 @@ private Digamma(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Digamma<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Digamma"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Digamma");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Digamma<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Div.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Div.java
index 3f62060e9be..8988d560e5a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Div.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Div.java
@@ -64,10 +64,9 @@ private Div(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Div<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Div"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Div");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Div<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DivNoNan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DivNoNan.java
index ba8d8501b54..fc3fe91315d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DivNoNan.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DivNoNan.java
@@ -64,10 +64,9 @@ private DivNoNan(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> DivNoNan<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DivNoNan"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DivNoNan");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DivNoNan<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Equal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Equal.java
index 91168cdab7f..4c37a703bb8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Equal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Equal.java
@@ -74,10 +74,9 @@ private Equal(Operation operation) {
   )
   public static <T extends TType> Equal create(Scope scope, Operand<T> x, Operand<T> y,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Equal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Equal");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.incompatibleShapeError != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erf.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erf.java
index f43df0cf45e..78103474f66 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erf.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erf.java
@@ -28,7 +28,7 @@
 import org.tensorflow.types.family.TNumber;
 
 /**
- * Computes the Gauss error function of {@code x} element-wise.
+ * Computes the  <a href="https://en.wikipedia.org/wiki/Error_function">Gauss error function</a>  of {@code x} element-wise. In statistics, for non-negative values of $x$, the error function has the following interpretation: for a random variable $Y$ that is normally distributed with mean 0 and variance $1/\sqrt{2}$, $erf(x)$ is the probability that $Y$ falls in the range $[−x, x]$.
  *
  * @param <T> data type for {@code y} output
  */
@@ -61,9 +61,8 @@ private Erf(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Erf<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Erf"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Erf");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Erf<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erfc.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erfc.java
index 050212be504..68bad7cb746 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erfc.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erfc.java
@@ -61,9 +61,8 @@ private Erfc(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Erfc<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Erfc"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Erfc");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Erfc<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Exp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Exp.java
index e48ba3892ea..03d468a2553 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Exp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Exp.java
@@ -82,9 +82,8 @@ private Exp(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Exp<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Exp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Exp");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Exp<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Expm1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Expm1.java
index 1fe5bb210f3..47759eeab1d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Expm1.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Expm1.java
@@ -73,9 +73,8 @@ private Expm1(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Expm1<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Expm1"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Expm1");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Expm1<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Fact.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Fact.java
index 5c41d484491..d7fae0d2495 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Fact.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Fact.java
@@ -57,8 +57,7 @@ private Fact(Operation operation) {
       describeByClass = true
   )
   public static Fact create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fact"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Fact");
     return new Fact(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Floor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Floor.java
index 759e8ad4862..2901b5af2ac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Floor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Floor.java
@@ -61,9 +61,8 @@ private Floor(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Floor<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Floor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Floor");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Floor<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorDiv.java
index 07da210d584..88c184551e3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorDiv.java
@@ -64,10 +64,9 @@ private FloorDiv(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> FloorDiv<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FloorDiv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FloorDiv");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new FloorDiv<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorMod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorMod.java
index a3692d20df6..d8292045766 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorMod.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorMod.java
@@ -66,10 +66,9 @@ private FloorMod(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> FloorMod<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FloorMod"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FloorMod");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new FloorMod<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Greater.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Greater.java
index 9929569d99d..5986b90cc87 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Greater.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Greater.java
@@ -73,10 +73,9 @@ private Greater(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Greater create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Greater"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Greater");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Greater(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/GreaterEqual.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/GreaterEqual.java
index 26ae03084b8..96a0c33cdac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/GreaterEqual.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/GreaterEqual.java
@@ -73,10 +73,9 @@ private GreaterEqual(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> GreaterEqual create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GreaterEqual"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GreaterEqual");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new GreaterEqual(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igamma.java
index 0a2201229e1..d6b96a559bb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igamma.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igamma.java
@@ -69,10 +69,9 @@ private Igamma(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Igamma<T> create(Scope scope, Operand<T> a, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Igamma"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Igamma");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Igamma<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IgammaGradA.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IgammaGradA.java
index 1b2a0401952..cca8e5abc1b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IgammaGradA.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IgammaGradA.java
@@ -58,10 +58,9 @@ private IgammaGradA(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> IgammaGradA<T> create(Scope scope, Operand<T> a, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IgammaGradA"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IgammaGradA");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IgammaGradA<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igammac.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igammac.java
index 17966df3b73..02a42548c8a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igammac.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igammac.java
@@ -32,8 +32,8 @@
  * The upper regularized incomplete Gamma function is defined as:
  * <p>\(Q(a, x) = Gamma(a, x) / Gamma(a) = 1 - P(a, x)\)
  * <p>where
- * <p>\(Gamma(a, x) = int_{x}^{\infty} t^{a-1} exp(-t) dt\)
- * <p>is the upper incomplete Gama function.
+ * <p>\(Gamma(a, x) = \int_{x}^{\infty} t^{a-1} exp(-t) dt\)
+ * <p>is the upper incomplete Gamma function.
  * <p>Note, above {@code P(a, x)} ({@code Igamma}) is the lower regularized complete
  * Gamma function.
  *
@@ -69,10 +69,9 @@ private Igammac(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Igammac<T> create(Scope scope, Operand<T> a, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Igammac"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Igammac");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Igammac<>(opBuilder.build());
   }
 
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 6d1bf220734..e650e5ed4fc 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
@@ -75,9 +75,8 @@ private Imag(Operation operation) {
   )
   public static <U extends TNumber> Imag<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> Tout) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Imag"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Imag");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     return new Imag<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/InvertPermutation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/InvertPermutation.java
index ae6346a3bc3..25f38778533 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/InvertPermutation.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/InvertPermutation.java
@@ -72,9 +72,8 @@ private InvertPermutation(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> InvertPermutation<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InvertPermutation"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InvertPermutation");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new InvertPermutation<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java
index 74fb4880e01..793ab136dcd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java
@@ -67,9 +67,8 @@ private IsFinite(Operation operation) {
       describeByClass = true
   )
   public static IsFinite create(Scope scope, Operand<? extends TNumber> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsFinite"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IsFinite");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IsFinite(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java
index bb51b1ade20..6a347f259ee 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java
@@ -67,9 +67,8 @@ private IsInf(Operation operation) {
       describeByClass = true
   )
   public static IsInf create(Scope scope, Operand<? extends TNumber> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsInf"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IsInf");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IsInf(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java
index b158338a052..35e52265f72 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java
@@ -67,9 +67,8 @@ private IsNan(Operation operation) {
       describeByClass = true
   )
   public static IsNan create(Scope scope, Operand<? extends TNumber> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsNan"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IsNan");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new IsNan(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Less.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Less.java
index 89b264d2a78..a45e1462e4e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Less.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Less.java
@@ -73,10 +73,9 @@ private Less(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Less create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Less"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Less");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Less(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LessEqual.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LessEqual.java
index c8861aeff31..2ded1a54f94 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LessEqual.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LessEqual.java
@@ -73,10 +73,9 @@ private LessEqual(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> LessEqual create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LessEqual"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LessEqual");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LessEqual(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Lgamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Lgamma.java
index 8afb9c307fd..30a35ea9223 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Lgamma.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Lgamma.java
@@ -68,9 +68,8 @@ private Lgamma(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Lgamma<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Lgamma"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Lgamma");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Lgamma<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log.java
index a974b9f8478..69190a0255c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log.java
@@ -67,9 +67,8 @@ private Log(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Log<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Log"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Log");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Log<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log1p.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log1p.java
index bdccc675f90..cf86bcf4420 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log1p.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log1p.java
@@ -67,9 +67,8 @@ private Log1p(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Log1p<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Log1p"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Log1p");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Log1p<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalAnd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalAnd.java
index efa9c2a2379..c5db6740088 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalAnd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalAnd.java
@@ -61,10 +61,9 @@ private LogicalAnd(Operation operation) {
       describeByClass = true
   )
   public static LogicalAnd create(Scope scope, Operand<TBool> x, Operand<TBool> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogicalAnd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LogicalAnd");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LogicalAnd(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalNot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalNot.java
index 2d5388f1bf0..d0a2c92741d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalNot.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalNot.java
@@ -58,9 +58,8 @@ private LogicalNot(Operation operation) {
       describeByClass = true
   )
   public static LogicalNot create(Scope scope, Operand<TBool> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogicalNot"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LogicalNot");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LogicalNot(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalOr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalOr.java
index ddd3fb8bd54..98cd56008ac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalOr.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalOr.java
@@ -61,10 +61,9 @@ private LogicalOr(Operation operation) {
       describeByClass = true
   )
   public static LogicalOr create(Scope scope, Operand<TBool> x, Operand<TBool> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogicalOr"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LogicalOr");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LogicalOr(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Maximum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Maximum.java
index ecd43416bf7..93762b5eefb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Maximum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Maximum.java
@@ -64,10 +64,9 @@ private Maximum(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Maximum<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Maximum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Maximum");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Maximum<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java
index 0f45a4a702a..2dea3ff81fa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java
@@ -70,10 +70,9 @@ private Mean(Operation operation) {
   )
   public static <T extends TType> Mean<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mean"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Mean");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Minimum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Minimum.java
index 5acf98b24f0..aeff1863af4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Minimum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Minimum.java
@@ -64,10 +64,9 @@ private Minimum(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Minimum<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Minimum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Minimum");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Minimum<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mod.java
index 078b0e8f4c5..21b00a05bf7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mod.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mod.java
@@ -66,10 +66,9 @@ private Mod(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Mod<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mod"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Mod");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Mod<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mul.java
index cbfaeb66151..d763f538ab7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mul.java
@@ -64,10 +64,9 @@ private Mul(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Mul<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Mul");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Mul<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/MulNoNan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/MulNoNan.java
index 8c9e32db85e..9752010053f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/MulNoNan.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/MulNoNan.java
@@ -64,10 +64,9 @@ private MulNoNan(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> MulNoNan<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MulNoNan"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MulNoNan");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new MulNoNan<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ndtri.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ndtri.java
index 925f0ab8db5..8ebe4057cf5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ndtri.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ndtri.java
@@ -61,9 +61,8 @@ private Ndtri(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Ndtri<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ndtri"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Ndtri");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Ndtri<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Neg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Neg.java
index 085675cd65f..d5778161810 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Neg.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Neg.java
@@ -62,9 +62,8 @@ private Neg(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Neg<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Neg"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Neg");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Neg<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NextAfter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NextAfter.java
index daf28601b65..51cc6a5efd4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NextAfter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NextAfter.java
@@ -67,10 +67,9 @@ private NextAfter(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> NextAfter<T> create(Scope scope, Operand<T> x1, Operand<T> x2) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NextAfter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NextAfter");
     opBuilder.addInput(x1.asOutput());
     opBuilder.addInput(x2.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new NextAfter<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NotEqual.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NotEqual.java
index 1291b1a8850..a47f07b2d49 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NotEqual.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NotEqual.java
@@ -65,10 +65,9 @@ private NotEqual(Operation operation) {
   )
   public static <T extends TType> NotEqual create(Scope scope, Operand<T> x, Operand<T> y,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NotEqual"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NotEqual");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.incompatibleShapeError != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Polygamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Polygamma.java
index bbcd3bd9dad..a64e3f6c0c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Polygamma.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Polygamma.java
@@ -66,10 +66,9 @@ private Polygamma(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Polygamma<T> create(Scope scope, Operand<T> a, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Polygamma"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Polygamma");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Polygamma<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java
index 5c9f2c63137..4dd412ed439 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java
@@ -64,9 +64,8 @@ private PopulationCount(Operation operation) {
       describeByClass = true
   )
   public static PopulationCount create(Scope scope, Operand<? extends TNumber> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PopulationCount"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PopulationCount");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new PopulationCount(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Pow.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Pow.java
index 2f39d1da201..ae2f093d57e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Pow.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Pow.java
@@ -69,10 +69,9 @@ private Pow(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Pow<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Pow"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Pow");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Pow<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java
index f6cdf0c8a13..be18d7ab977 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java
@@ -77,14 +77,13 @@ private QuantizedAdd(Operation operation) {
   public static <V extends TNumber> QuantizedAdd<V> create(Scope scope,
       Operand<? extends TNumber> x, Operand<? extends TNumber> y, Operand<TFloat32> minX,
       Operand<TFloat32> maxX, Operand<TFloat32> minY, Operand<TFloat32> maxY, Class<V> Toutput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedAdd");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(minX.asOutput());
     opBuilder.addInput(maxX.asOutput());
     opBuilder.addInput(minY.asOutput());
     opBuilder.addInput(maxY.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     return new QuantizedAdd<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java
index 14d2ef8f4b0..8091f86dd3f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java
@@ -77,14 +77,13 @@ private QuantizedMul(Operation operation) {
   public static <V extends TNumber> QuantizedMul<V> create(Scope scope,
       Operand<? extends TNumber> x, Operand<? extends TNumber> y, Operand<TFloat32> minX,
       Operand<TFloat32> maxX, Operand<TFloat32> minY, Operand<TFloat32> maxY, Class<V> Toutput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedMul");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(minX.asOutput());
     opBuilder.addInput(maxX.asOutput());
     opBuilder.addInput(minY.asOutput());
     opBuilder.addInput(maxY.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     return new QuantizedMul<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java
index ec019f2899f..7534337cb26 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java
@@ -75,9 +75,8 @@ private Real(Operation operation) {
   )
   public static <U extends TNumber> Real<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> Tout) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Real"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Real");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     return new Real<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RealDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RealDiv.java
index 6ca3a21c7f3..7073764f171 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RealDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RealDiv.java
@@ -65,10 +65,9 @@ private RealDiv(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> RealDiv<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RealDiv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RealDiv");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RealDiv<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Reciprocal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Reciprocal.java
index 179c86160fe..6b199d06c72 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Reciprocal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Reciprocal.java
@@ -62,9 +62,8 @@ private Reciprocal(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Reciprocal<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reciprocal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Reciprocal");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Reciprocal<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ReciprocalGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ReciprocalGrad.java
index bc95cef39c5..1865d94ada7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ReciprocalGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ReciprocalGrad.java
@@ -61,10 +61,9 @@ private ReciprocalGrad(Operation operation) {
   )
   public static <T extends TType> ReciprocalGrad<T> create(Scope scope, Operand<T> y,
       Operand<T> dy) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReciprocalGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReciprocalGrad");
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(dy.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReciprocalGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java
index 6c1539cee41..d1b018c5a51 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java
@@ -63,11 +63,10 @@ private RequantizationRangePerChannel(Operation operation) {
   )
   public static RequantizationRangePerChannel create(Scope scope, Operand<? extends TNumber> input,
       Operand<TFloat32> inputMin, Operand<TFloat32> inputMax, Float clipValueMax) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RequantizationRangePerChannel"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RequantizationRangePerChannel");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("clip_value_max", clipValueMax);
     return new RequantizationRangePerChannel(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java
index 76c28bd2b87..833e4472731 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java
@@ -73,13 +73,12 @@ public static <U extends TNumber> RequantizePerChannel<U> create(Scope scope,
       Operand<? extends TNumber> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax,
       Operand<TFloat32> requestedOutputMin, Operand<TFloat32> requestedOutputMax,
       Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RequantizePerChannel"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RequantizePerChannel");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
     opBuilder.addInput(requestedOutputMin.asOutput());
     opBuilder.addInput(requestedOutputMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new RequantizePerChannel<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rint.java
index 4d139c2aed8..e1eb0d407d9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rint.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rint.java
@@ -69,9 +69,8 @@ private Rint(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Rint<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rint"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Rint");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Rint<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Round.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Round.java
index 6198340ce3f..1adeea2a548 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Round.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Round.java
@@ -63,9 +63,8 @@ private Round(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Round<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Round"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Round");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Round<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rsqrt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rsqrt.java
index c5414bba1f4..be3fa6fdac3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rsqrt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rsqrt.java
@@ -62,9 +62,8 @@ private Rsqrt(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Rsqrt<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rsqrt"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Rsqrt");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Rsqrt<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RsqrtGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RsqrtGrad.java
index 4537e79ef60..6e0c26a41a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RsqrtGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RsqrtGrad.java
@@ -60,10 +60,9 @@ private RsqrtGrad(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> RsqrtGrad<T> create(Scope scope, Operand<T> y, Operand<T> dy) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RsqrtGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RsqrtGrad");
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(dy.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RsqrtGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java
index 65e7b648769..364dcf15551 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java
@@ -81,10 +81,9 @@ private SegmentMax(Operation operation) {
   )
   public static <T extends TNumber> SegmentMax<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SegmentMax");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SegmentMax<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java
index ca2733c96c8..b3f41259f52 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java
@@ -83,10 +83,9 @@ private SegmentMean(Operation operation) {
   )
   public static <T extends TType> SegmentMean<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentMean"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SegmentMean");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SegmentMean<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java
index 2c0da496029..2f2fc4a349b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java
@@ -81,10 +81,9 @@ private SegmentMin(Operation operation) {
   )
   public static <T extends TNumber> SegmentMin<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SegmentMin");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SegmentMin<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java
index 6c79d7cbb0f..3bd1645daa8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java
@@ -82,10 +82,9 @@ private SegmentProd(Operation operation) {
   )
   public static <T extends TType> SegmentProd<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentProd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SegmentProd");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SegmentProd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java
index aae76b9dd85..c2cc2fb479a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java
@@ -82,10 +82,9 @@ private SegmentSum(Operation operation) {
   )
   public static <T extends TType> SegmentSum<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentSum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SegmentSum");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SegmentSum<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sigmoid.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sigmoid.java
index d76210dc510..485274fa7ee 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sigmoid.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sigmoid.java
@@ -62,9 +62,8 @@ private Sigmoid(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Sigmoid<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sigmoid"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sigmoid");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Sigmoid<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SigmoidGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SigmoidGrad.java
index 3e307c96161..a5c4a9ebfbf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SigmoidGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SigmoidGrad.java
@@ -60,10 +60,9 @@ private SigmoidGrad(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> SigmoidGrad<T> create(Scope scope, Operand<T> y, Operand<T> dy) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SigmoidGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SigmoidGrad");
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(dy.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SigmoidGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sign.java
index 0f7b1a02ac2..ccdba9e8bb8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sign.java
@@ -72,9 +72,8 @@ private Sign(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Sign<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sign");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Sign<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sin.java
index 7f4fa0211bd..25913e2d26e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sin.java
@@ -68,9 +68,8 @@ private Sin(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Sin<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sin");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Sin<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sinh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sinh.java
index 8d89458774a..14c8e9a2d9c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sinh.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sinh.java
@@ -68,9 +68,8 @@ private Sinh(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Sinh<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sinh"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sinh");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Sinh<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SobolSample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SobolSample.java
index ee8508fba07..ad9d308baa8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SobolSample.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SobolSample.java
@@ -68,11 +68,10 @@ private SobolSample(Operation operation) {
   )
   public static <T extends TNumber> SobolSample<T> create(Scope scope, Operand<TInt32> dim,
       Operand<TInt32> numResults, Operand<TInt32> skip, Class<T> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SobolSample"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SobolSample");
     opBuilder.addInput(dim.asOutput());
     opBuilder.addInput(numResults.asOutput());
     opBuilder.addInput(skip.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new SobolSample<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Softplus.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Softplus.java
index 41fb2fbbda1..b8e861fda0d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Softplus.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Softplus.java
@@ -61,9 +61,8 @@ private Softplus(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Softplus<T> create(Scope scope, Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Softplus"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Softplus");
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Softplus<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SoftplusGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SoftplusGrad.java
index f9662185666..56f08bc78b6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SoftplusGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SoftplusGrad.java
@@ -59,10 +59,9 @@ private SoftplusGrad(Operation operation) {
   )
   public static <T extends TNumber> SoftplusGrad<T> create(Scope scope, Operand<T> gradients,
       Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SoftplusGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SoftplusGrad");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SoftplusGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sqrt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sqrt.java
index 43c436f2a1e..81a0fd29f58 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sqrt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sqrt.java
@@ -62,9 +62,8 @@ private Sqrt(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Sqrt<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sqrt"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sqrt");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Sqrt<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SqrtGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SqrtGrad.java
index 4b941896b95..eae4da43173 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SqrtGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SqrtGrad.java
@@ -60,10 +60,9 @@ private SqrtGrad(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> SqrtGrad<T> create(Scope scope, Operand<T> y, Operand<T> dy) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SqrtGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SqrtGrad");
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(dy.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SqrtGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Square.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Square.java
index bd513b48b81..19622576247 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Square.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Square.java
@@ -62,9 +62,8 @@ private Square(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Square<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Square"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Square");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Square<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SquaredDifference.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SquaredDifference.java
index ff49e2a2be0..cb01df2fd23 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SquaredDifference.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SquaredDifference.java
@@ -65,10 +65,9 @@ private SquaredDifference(Operation operation) {
   )
   public static <T extends TType> SquaredDifference<T> create(Scope scope, Operand<T> x,
       Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SquaredDifference"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SquaredDifference");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SquaredDifference<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sub.java
index 494e6a0a48e..006833e67d6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sub.java
@@ -64,10 +64,9 @@ private Sub(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Sub<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sub");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Sub<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tan.java
index c12388ecf17..69d3fd517d4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tan.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tan.java
@@ -69,9 +69,8 @@ private Tan(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Tan<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Tan"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Tan");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Tan<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tanh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tanh.java
index 9d3d1407e55..2bbdb6d5078 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tanh.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tanh.java
@@ -75,9 +75,8 @@ private Tanh(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Tanh<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Tanh"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Tanh");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Tanh<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TanhGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TanhGrad.java
index 9513223a61c..3ee48eb3711 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TanhGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TanhGrad.java
@@ -60,10 +60,9 @@ private TanhGrad(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> TanhGrad<T> create(Scope scope, Operand<T> y, Operand<T> dy) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TanhGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TanhGrad");
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(dy.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TanhGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateDiv.java
index a5b7247eb9c..8bd43a99784 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateDiv.java
@@ -68,10 +68,9 @@ private TruncateDiv(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> TruncateDiv<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TruncateDiv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TruncateDiv");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TruncateDiv<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateMod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateMod.java
index afc4a569f0c..c1614618783 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateMod.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateMod.java
@@ -65,10 +65,9 @@ private TruncateMod(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> TruncateMod<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TruncateMod"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TruncateMod");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TruncateMod<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java
index 5948bea7bb4..dbdeb204a82 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java
@@ -87,11 +87,10 @@ private UnsortedSegmentMax(Operation operation) {
   )
   public static <T extends TNumber> UnsortedSegmentMax<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnsortedSegmentMax");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(numSegments.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new UnsortedSegmentMax<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java
index 4c924844b12..7d2a113e53d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java
@@ -84,11 +84,10 @@ private UnsortedSegmentMin(Operation operation) {
   )
   public static <T extends TNumber> UnsortedSegmentMin<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnsortedSegmentMin");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(numSegments.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new UnsortedSegmentMin<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java
index ad3b2afa22a..eda5093e66a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java
@@ -84,11 +84,10 @@ private UnsortedSegmentProd(Operation operation) {
   )
   public static <T extends TType> UnsortedSegmentProd<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentProd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnsortedSegmentProd");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(numSegments.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new UnsortedSegmentProd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java
index 6a7d80d3bce..d5587f5e862 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java
@@ -47,9 +47,9 @@
  * </div>
  * <pre>
  * c = tf.constant([[1,2,3,4], [5,6,7,8], [4,3,2,1]])
- * tf.unsorted_segment_sum(c, tf.constant([0, 1, 0]), num_segments=2)
- * # ==&gt; [[ 5,  5, 5, 5],
- * #       [5,  6, 7, 8]]
+ * tf.math.unsorted_segment_sum(c, tf.constant([0, 1, 0]), num_segments=2)
+ * # ==&gt; [[ 5, 5, 5, 5],
+ * #       [5, 6, 7, 8]]
  * </pre>
  *
  * @param <T> data type for {@code output} output
@@ -86,11 +86,10 @@ private UnsortedSegmentSum(Operation operation) {
   )
   public static <T extends TType> UnsortedSegmentSum<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentSum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnsortedSegmentSum");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(numSegments.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new UnsortedSegmentSum<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xdivy.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xdivy.java
index 51b01fcc145..cc6624e1cd0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xdivy.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xdivy.java
@@ -62,10 +62,9 @@ private Xdivy(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Xdivy<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Xdivy"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Xdivy");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Xdivy<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlog1py.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlog1py.java
index 40a9ffde383..100ff3d2122 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlog1py.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlog1py.java
@@ -62,10 +62,9 @@ private Xlog1py(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Xlog1py<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Xlog1py"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Xlog1py");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Xlog1py<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlogy.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlogy.java
index c40480718a7..edf378b4512 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlogy.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlogy.java
@@ -62,10 +62,9 @@ private Xlogy(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Xlogy<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Xlogy"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Xlogy");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Xlogy<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Zeta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Zeta.java
index f137c7387fa..78aa171bfb2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Zeta.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Zeta.java
@@ -64,10 +64,9 @@ private Zeta(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Zeta<T> create(Scope scope, Operand<T> x, Operand<T> q) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Zeta"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Zeta");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(q.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Zeta<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/erfinv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/erfinv.java
index 312289d1311..6953ecc8077 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/erfinv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/erfinv.java
@@ -61,9 +61,8 @@ private erfinv(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> erfinv<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("erfinv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "erfinv");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new erfinv<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ0.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ0.java
index 5a813d9bc63..519967fc69b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ0.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ0.java
@@ -57,9 +57,8 @@ private BesselJ0(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselJ0<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselJ0"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselJ0");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselJ0<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ1.java
index e5465ae883c..2c7665e4453 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ1.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ1.java
@@ -57,9 +57,8 @@ private BesselJ1(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselJ1<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselJ1"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselJ1");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselJ1<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0.java
index e0ece545227..89f9f9053e6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0.java
@@ -57,9 +57,8 @@ private BesselK0(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselK0<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselK0"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselK0");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselK0<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0e.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0e.java
index 66ea449ddc8..312a80d2c7a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0e.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0e.java
@@ -57,9 +57,8 @@ private BesselK0e(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselK0e<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselK0e"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselK0e");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselK0e<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1.java
index e0d1e82c578..509eb4af314 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1.java
@@ -57,9 +57,8 @@ private BesselK1(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselK1<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselK1"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselK1");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselK1<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1e.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1e.java
index 1137ceb5430..0044ef761cc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1e.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1e.java
@@ -57,9 +57,8 @@ private BesselK1e(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselK1e<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselK1e"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselK1e");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselK1e<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY0.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY0.java
index 5991a62d911..55c8e7de4d9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY0.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY0.java
@@ -57,9 +57,8 @@ private BesselY0(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselY0<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselY0"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselY0");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselY0<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY1.java
index 87fe3b8b799..8dace2d3cbb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY1.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY1.java
@@ -57,9 +57,8 @@ private BesselY1(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> BesselY1<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselY1"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BesselY1");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BesselY1<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Dawsn.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Dawsn.java
index b8fd4b7c4bf..1c7334efbc9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Dawsn.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Dawsn.java
@@ -57,9 +57,8 @@ private Dawsn(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Dawsn<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dawsn"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Dawsn");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Dawsn<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Expint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Expint.java
index a5459c2e49a..75e4da57938 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Expint.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Expint.java
@@ -57,9 +57,8 @@ private Expint(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Expint<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Expint"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Expint");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Expint<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelCos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelCos.java
index 9ed978da85f..62ad26be841 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelCos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelCos.java
@@ -57,9 +57,8 @@ private FresnelCos(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> FresnelCos<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FresnelCos"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FresnelCos");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new FresnelCos<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelSin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelSin.java
index 4de11696395..c3f8e75299b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelSin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelSin.java
@@ -57,9 +57,8 @@ private FresnelSin(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> FresnelSin<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FresnelSin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FresnelSin");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new FresnelSin<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Spence.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Spence.java
index 18da2e750c2..96588efcd87 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Spence.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Spence.java
@@ -57,9 +57,8 @@ private Spence(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Spence<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Spence"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Spence");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Spence<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool.java
index 13947a3f016..c96b474b4a0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool.java
@@ -69,9 +69,8 @@ private AvgPool(Operation operation) {
   )
   public static <T extends TNumber> AvgPool<T> create(Scope scope, Operand<T> value,
       List<Long> ksize, List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AvgPool"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AvgPool");
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3d.java
index 2dbb98b2960..d1500731844 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3d.java
@@ -71,9 +71,8 @@ private AvgPool3d(Operation operation) {
   )
   public static <T extends TNumber> AvgPool3d<T> create(Scope scope, Operand<T> input,
       List<Long> ksize, List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AvgPool3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AvgPool3d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3dGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3dGrad.java
index af10950e7fb..9be20b9dd64 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3dGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3dGrad.java
@@ -72,10 +72,9 @@ private AvgPool3dGrad(Operation operation) {
   public static <T extends TNumber> AvgPool3dGrad<T> create(Scope scope,
       Operand<TInt32> origInputShape, Operand<T> grad, List<Long> ksize, List<Long> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AvgPool3dGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AvgPool3dGrad");
     opBuilder.addInput(origInputShape.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPoolGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPoolGrad.java
index 813fd26b428..cc6b577a475 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPoolGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPoolGrad.java
@@ -67,10 +67,9 @@ private AvgPoolGrad(Operation operation) {
   public static <T extends TNumber> AvgPoolGrad<T> create(Scope scope,
       Operand<TInt32> origInputShape, Operand<T> grad, List<Long> ksize, List<Long> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AvgPoolGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AvgPoolGrad");
     opBuilder.addInput(origInputShape.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalization.java
index 47cf236cad5..3f53920618b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalization.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalization.java
@@ -78,13 +78,12 @@ private BatchNormWithGlobalNormalization(Operation operation) {
   public static <T extends TType> BatchNormWithGlobalNormalization<T> create(Scope scope,
       Operand<T> t, Operand<T> m, Operand<T> v, Operand<T> beta, Operand<T> gamma,
       Float varianceEpsilon, Boolean scaleAfterNormalization) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchNormWithGlobalNormalization"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchNormWithGlobalNormalization");
     opBuilder.addInput(t.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(v.asOutput());
     opBuilder.addInput(beta.asOutput());
     opBuilder.addInput(gamma.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("variance_epsilon", varianceEpsilon);
     opBuilder.setAttr("scale_after_normalization", scaleAfterNormalization);
     return new BatchNormWithGlobalNormalization<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalizationGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalizationGrad.java
index 0472d472dd6..e248dc193d2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalizationGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalizationGrad.java
@@ -89,13 +89,12 @@ private BatchNormWithGlobalNormalizationGrad(Operation operation) {
   public static <T extends TType> BatchNormWithGlobalNormalizationGrad<T> create(Scope scope,
       Operand<T> t, Operand<T> m, Operand<T> v, Operand<T> gamma, Operand<T> backprop,
       Float varianceEpsilon, Boolean scaleAfterNormalization) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchNormWithGlobalNormalizationGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchNormWithGlobalNormalizationGrad");
     opBuilder.addInput(t.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(v.asOutput());
     opBuilder.addInput(gamma.asOutput());
     opBuilder.addInput(backprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("variance_epsilon", varianceEpsilon);
     opBuilder.setAttr("scale_after_normalization", scaleAfterNormalization);
     return new BatchNormWithGlobalNormalizationGrad<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAdd.java
index fd477c86dc5..ba021575492 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAdd.java
@@ -66,10 +66,9 @@ private BiasAdd(Operation operation) {
   )
   public static <T extends TType> BiasAdd<T> create(Scope scope, Operand<T> value, Operand<T> bias,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BiasAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BiasAdd");
     opBuilder.addInput(value.asOutput());
     opBuilder.addInput(bias.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.dataFormat != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAddGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAddGrad.java
index 70204d02a5a..661a84087e0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAddGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAddGrad.java
@@ -66,9 +66,8 @@ private BiasAddGrad(Operation operation) {
   )
   public static <T extends TType> BiasAddGrad<T> create(Scope scope, Operand<T> outBackprop,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BiasAddGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BiasAddGrad");
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.dataFormat != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTM.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTM.java
index d6f0ead46ba..fd6708a1772 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTM.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTM.java
@@ -108,7 +108,7 @@ private BlockLSTM(Operation operation) {
   public static <T extends TNumber> BlockLSTM<T> create(Scope scope, Operand<TInt64> seqLenMax,
       Operand<T> x, Operand<T> csPrev, Operand<T> hPrev, Operand<T> w, Operand<T> wci,
       Operand<T> wcf, Operand<T> wco, Operand<T> b, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BlockLSTM"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BlockLSTM");
     opBuilder.addInput(seqLenMax.asOutput());
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(csPrev.asOutput());
@@ -118,7 +118,6 @@ public static <T extends TNumber> BlockLSTM<T> create(Scope scope, Operand<TInt6
     opBuilder.addInput(wcf.asOutput());
     opBuilder.addInput(wco.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.cellClip != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTMGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTMGrad.java
index 3727d150aac..522df1b3b32 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTMGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTMGrad.java
@@ -103,7 +103,7 @@ public static <T extends TNumber> BlockLSTMGrad<T> create(Scope scope, Operand<T
       Operand<T> wcf, Operand<T> wco, Operand<T> b, Operand<T> i, Operand<T> cs, Operand<T> f,
       Operand<T> o, Operand<T> ci, Operand<T> co, Operand<T> h, Operand<T> csGrad, Operand<T> hGrad,
       Boolean usePeephole) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BlockLSTMGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BlockLSTMGrad");
     opBuilder.addInput(seqLenMax.asOutput());
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(csPrev.asOutput());
@@ -122,7 +122,6 @@ public static <T extends TNumber> BlockLSTMGrad<T> create(Scope scope, Operand<T
     opBuilder.addInput(h.asOutput());
     opBuilder.addInput(csGrad.asOutput());
     opBuilder.addInput(hGrad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("use_peephole", usePeephole);
     return new BlockLSTMGrad<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CTCLossV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CTCLossV2.java
index b8d3779d820..2c3309dc9fc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CTCLossV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CTCLossV2.java
@@ -70,12 +70,11 @@ private CTCLossV2(Operation operation) {
   public static CTCLossV2 create(Scope scope, Operand<TFloat32> inputs,
       Operand<TInt64> labelsIndices, Operand<TInt32> labelsValues, Operand<TInt32> sequenceLength,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CTCLossV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CTCLossV2");
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(labelsIndices.asOutput());
     opBuilder.addInput(labelsValues.asOutput());
     opBuilder.addInput(sequenceLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.preprocessCollapseRepeated != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ComputeAccidentalHits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ComputeAccidentalHits.java
index 594719f47ac..6de1761c2b1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ComputeAccidentalHits.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ComputeAccidentalHits.java
@@ -74,10 +74,9 @@ private ComputeAccidentalHits(Operation operation) {
   )
   public static ComputeAccidentalHits create(Scope scope, Operand<TInt64> trueClasses,
       Operand<TInt64> sampledCandidates, Long numTrue, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ComputeAccidentalHits"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ComputeAccidentalHits");
     opBuilder.addInput(trueClasses.asOutput());
     opBuilder.addInput(sampledCandidates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_true", numTrue);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2d.java
index cdc3d27b72a..abe9e0e66dc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2d.java
@@ -92,10 +92,9 @@ private Conv2d(Operation operation) {
   )
   public static <T extends TNumber> Conv2d<T> create(Scope scope, Operand<T> input,
       Operand<T> filter, List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Conv2d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropFilter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropFilter.java
index a1d95bcbd54..e909a1ab6ff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropFilter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropFilter.java
@@ -76,11 +76,10 @@ private Conv2dBackpropFilter(Operation operation) {
   public static <T extends TNumber> Conv2dBackpropFilter<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> filterSizes, Operand<T> outBackprop, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv2dBackpropFilter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Conv2dBackpropFilter");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filterSizes.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropInput.java
index 334519fd5fd..7231ac48f8b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropInput.java
@@ -76,11 +76,10 @@ private Conv2dBackpropInput(Operation operation) {
   public static <T extends TNumber> Conv2dBackpropInput<T> create(Scope scope,
       Operand<TInt32> inputSizes, Operand<T> filter, Operand<T> outBackprop, List<Long> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv2dBackpropInput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Conv2dBackpropInput");
     opBuilder.addInput(inputSizes.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3d.java
index 0fe70b05c62..b3059545246 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3d.java
@@ -73,10 +73,9 @@ private Conv3d(Operation operation) {
   )
   public static <T extends TNumber> Conv3d<T> create(Scope scope, Operand<T> input,
       Operand<T> filter, List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Conv3d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropFilter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropFilter.java
index 456ee91437f..c9f15f99431 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropFilter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropFilter.java
@@ -75,11 +75,10 @@ private Conv3dBackpropFilter(Operation operation) {
   public static <T extends TNumber> Conv3dBackpropFilter<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> filterSizes, Operand<T> outBackprop, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv3dBackpropFilter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Conv3dBackpropFilter");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filterSizes.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java
index 7f84fb3b019..4cfce74a0ce 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java
@@ -74,11 +74,10 @@ private Conv3dBackpropInput(Operation operation) {
   public static <U extends TNumber> Conv3dBackpropInput<U> create(Scope scope,
       Operand<? extends TNumber> inputSizes, Operand<U> filter, Operand<U> outBackprop,
       List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv3dBackpropInput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Conv3dBackpropInput");
     opBuilder.addInput(inputSizes.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcBeamSearchDecoder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcBeamSearchDecoder.java
index 22bbe1d8274..ff6a6420b0c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcBeamSearchDecoder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcBeamSearchDecoder.java
@@ -91,10 +91,9 @@ private CtcBeamSearchDecoder(Operation operation) {
   )
   public static <T extends TNumber> CtcBeamSearchDecoder<T> create(Scope scope, Operand<T> inputs,
       Operand<TInt32> sequenceLength, Long beamWidth, Long topPaths, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CtcBeamSearchDecoder"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CtcBeamSearchDecoder");
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(sequenceLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("beam_width", beamWidth);
     opBuilder.setAttr("top_paths", topPaths);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcGreedyDecoder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcGreedyDecoder.java
index 0630b40d3ba..525cc165763 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcGreedyDecoder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcGreedyDecoder.java
@@ -83,15 +83,17 @@ private CtcGreedyDecoder(Operation operation) {
   )
   public static <T extends TNumber> CtcGreedyDecoder<T> create(Scope scope, Operand<T> inputs,
       Operand<TInt32> sequenceLength, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CtcGreedyDecoder"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CtcGreedyDecoder");
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(sequenceLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.mergeRepeated != null) {
           opBuilder.setAttr("merge_repeated", opts.mergeRepeated);
         }
+        if (opts.blankIndex != null) {
+          opBuilder.setAttr("blank_index", opts.blankIndex);
+        }
       }
     }
     return new CtcGreedyDecoder<>(opBuilder.build());
@@ -107,6 +109,16 @@ public static Options mergeRepeated(Boolean mergeRepeated) {
     return new Options().mergeRepeated(mergeRepeated);
   }
 
+  /**
+   * Sets the blankIndex option.
+   *
+   * @param blankIndex the blankIndex option
+   * @return this Options instance.
+   */
+  public static Options blankIndex(Long blankIndex) {
+    return new Options().blankIndex(blankIndex);
+  }
+
   /**
    * Gets decodedIndices.
    * Indices matrix, size {@code (total_decoded_outputs x 2)},
@@ -153,6 +165,8 @@ public Output<T> logProbability() {
   public static class Options {
     private Boolean mergeRepeated;
 
+    private Long blankIndex;
+
     private Options() {
     }
 
@@ -166,5 +180,16 @@ public Options mergeRepeated(Boolean mergeRepeated) {
       this.mergeRepeated = mergeRepeated;
       return this;
     }
+
+    /**
+     * Sets the blankIndex option.
+     *
+     * @param blankIndex the blankIndex option
+     * @return this Options instance.
+     */
+    public Options blankIndex(Long blankIndex) {
+      this.blankIndex = blankIndex;
+      return this;
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcLoss.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcLoss.java
index 15ce085e575..92460960518 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcLoss.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcLoss.java
@@ -76,12 +76,11 @@ private CtcLoss(Operation operation) {
   public static <T extends TNumber> CtcLoss<T> create(Scope scope, Operand<T> inputs,
       Operand<TInt64> labelsIndices, Operand<TInt32> labelsValues, Operand<TInt32> sequenceLength,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CtcLoss"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CtcLoss");
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(labelsIndices.asOutput());
     opBuilder.addInput(labelsValues.asOutput());
     opBuilder.addInput(sequenceLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.preprocessCollapseRepeated != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNN.java
index 3c8adc1094e..5d32b0db85d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNN.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNN.java
@@ -115,13 +115,12 @@ private CudnnRNN(Operation operation) {
   public static <T extends TNumber> CudnnRNN<T> create(Scope scope, Operand<T> input,
       Operand<T> inputH, Operand<T> inputC, Operand<T> params, Operand<TInt32> sequenceLengths,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRNN"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CudnnRNN");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputH.asOutput());
     opBuilder.addInput(inputC.asOutput());
     opBuilder.addInput(params.asOutput());
     opBuilder.addInput(sequenceLengths.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.rnnMode != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNBackprop.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNBackprop.java
index f8852914f34..4c9166bc46d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNBackprop.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNBackprop.java
@@ -131,7 +131,7 @@ public static <T extends TNumber> CudnnRNNBackprop<T> create(Scope scope, Operan
       Operand<T> output, Operand<T> outputH, Operand<T> outputC, Operand<T> outputBackprop,
       Operand<T> outputHBackprop, Operand<T> outputCBackprop, Operand<T> reserveSpace,
       Operand<? extends TType> hostReserved, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRNNBackprop"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CudnnRNNBackprop");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputH.asOutput());
     opBuilder.addInput(inputC.asOutput());
@@ -145,7 +145,6 @@ public static <T extends TNumber> CudnnRNNBackprop<T> create(Scope scope, Operan
     opBuilder.addInput(outputCBackprop.asOutput());
     opBuilder.addInput(reserveSpace.asOutput());
     opBuilder.addInput(hostReserved.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.rnnMode != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNCanonicalToParams.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNCanonicalToParams.java
index d94d7201002..ca5b35320f8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNCanonicalToParams.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNCanonicalToParams.java
@@ -98,13 +98,12 @@ private CudnnRNNCanonicalToParams(Operation operation) {
   public static <T extends TNumber> CudnnRNNCanonicalToParams<T> create(Scope scope,
       Operand<TInt32> numLayers, Operand<TInt32> numUnits, Operand<TInt32> inputSize,
       Iterable<Operand<T>> weights, Iterable<Operand<T>> biases, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRNNCanonicalToParams"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CudnnRNNCanonicalToParams");
     opBuilder.addInput(numLayers.asOutput());
     opBuilder.addInput(numUnits.asOutput());
     opBuilder.addInput(inputSize.asOutput());
     opBuilder.addInputList(Operands.asOutputs(weights));
     opBuilder.addInputList(Operands.asOutputs(biases));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.rnnMode != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNParamsToCanonical.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNParamsToCanonical.java
index 70dc874dc27..4f161d810f5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNParamsToCanonical.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNParamsToCanonical.java
@@ -108,12 +108,11 @@ private CudnnRNNParamsToCanonical(Operation operation) {
   public static <T extends TNumber> CudnnRNNParamsToCanonical<T> create(Scope scope,
       Operand<TInt32> numLayers, Operand<TInt32> numUnits, Operand<TInt32> inputSize,
       Operand<T> params, Long numParamsWeights, Long numParamsBiases, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRNNParamsToCanonical"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CudnnRNNParamsToCanonical");
     opBuilder.addInput(numLayers.asOutput());
     opBuilder.addInput(numUnits.asOutput());
     opBuilder.addInput(inputSize.asOutput());
     opBuilder.addInput(params.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_params_weights", numParamsWeights);
     opBuilder.setAttr("num_params_biases", numParamsBiases);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRnnParamsSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRnnParamsSize.java
index 17114a95d9f..676460b8765 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRnnParamsSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRnnParamsSize.java
@@ -91,11 +91,10 @@ private CudnnRnnParamsSize(Operation operation) {
   public static <T extends TNumber, U extends TNumber> CudnnRnnParamsSize<T> create(Scope scope,
       Operand<TInt32> numLayers, Operand<TInt32> numUnits, Operand<TInt32> inputSize, Class<U> T,
       Class<T> S, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRnnParamsSize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CudnnRnnParamsSize");
     opBuilder.addInput(numLayers.asOutput());
     opBuilder.addInput(numUnits.asOutput());
     opBuilder.addInput(inputSize.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("T", Operands.toDataType(T));
     opBuilder.setAttr("S", Operands.toDataType(S));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatDimMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatDimMap.java
index 7ebfca31245..1ce3cba2ce5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatDimMap.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatDimMap.java
@@ -65,9 +65,8 @@ private DataFormatDimMap(Operation operation) {
   )
   public static <T extends TNumber> DataFormatDimMap<T> create(Scope scope, Operand<T> x,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DataFormatDimMap"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DataFormatDimMap");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.srcFormat != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatVecPermute.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatVecPermute.java
index 1f0740e51f9..73e7653b3a7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatVecPermute.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatVecPermute.java
@@ -82,9 +82,8 @@ private DataFormatVecPermute(Operation operation) {
   )
   public static <T extends TNumber> DataFormatVecPermute<T> create(Scope scope, Operand<T> x,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DataFormatVecPermute"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DataFormatVecPermute");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.srcFormat != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthToSpace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthToSpace.java
index 7607d7abc44..2e22c5f1658 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthToSpace.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthToSpace.java
@@ -138,9 +138,8 @@ private DepthToSpace(Operation operation) {
   )
   public static <T extends TType> DepthToSpace<T> create(Scope scope, Operand<T> input,
       Long blockSize, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DepthToSpace"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DepthToSpace");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("block_size", blockSize);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNative.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNative.java
index 115df899a13..262ae8aaeab 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNative.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNative.java
@@ -85,10 +85,9 @@ private DepthwiseConv2dNative(Operation operation) {
   )
   public static <T extends TNumber> DepthwiseConv2dNative<T> create(Scope scope, Operand<T> input,
       Operand<T> filter, List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DepthwiseConv2dNative"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DepthwiseConv2dNative");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropFilter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropFilter.java
index 46039ed5364..07e30fc3001 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropFilter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropFilter.java
@@ -78,11 +78,10 @@ private DepthwiseConv2dNativeBackpropFilter(Operation operation) {
   public static <T extends TNumber> DepthwiseConv2dNativeBackpropFilter<T> create(Scope scope,
       Operand<T> input, Operand<TInt32> filterSizes, Operand<T> outBackprop, List<Long> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DepthwiseConv2dNativeBackpropFilter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DepthwiseConv2dNativeBackpropFilter");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filterSizes.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropInput.java
index 84b917dda07..392345ee075 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropInput.java
@@ -78,11 +78,10 @@ private DepthwiseConv2dNativeBackpropInput(Operation operation) {
   public static <T extends TNumber> DepthwiseConv2dNativeBackpropInput<T> create(Scope scope,
       Operand<TInt32> inputSizes, Operand<T> filter, Operand<T> outBackprop, List<Long> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DepthwiseConv2dNativeBackpropInput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DepthwiseConv2dNativeBackpropInput");
     opBuilder.addInput(inputSizes.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2d.java
index 0ce416f962d..a070c09c659 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2d.java
@@ -90,10 +90,9 @@ private Dilation2d(Operation operation) {
   )
   public static <T extends TNumber> Dilation2d<T> create(Scope scope, Operand<T> input,
       Operand<T> filter, List<Long> strides, List<Long> rates, String padding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dilation2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Dilation2d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropFilter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropFilter.java
index f278fb3f223..e4b191ab199 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropFilter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropFilter.java
@@ -71,11 +71,10 @@ private Dilation2dBackpropFilter(Operation operation) {
   public static <T extends TNumber> Dilation2dBackpropFilter<T> create(Scope scope,
       Operand<T> input, Operand<T> filter, Operand<T> outBackprop, List<Long> strides,
       List<Long> rates, String padding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dilation2dBackpropFilter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Dilation2dBackpropFilter");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropInput.java
index def304dcbe7..12e8a9b2094 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropInput.java
@@ -71,11 +71,10 @@ private Dilation2dBackpropInput(Operation operation) {
   public static <T extends TNumber> Dilation2dBackpropInput<T> create(Scope scope, Operand<T> input,
       Operand<T> filter, Operand<T> outBackprop, List<Long> strides, List<Long> rates,
       String padding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dilation2dBackpropInput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Dilation2dBackpropInput");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Elu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Elu.java
index 35656420d31..801e842cd57 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Elu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Elu.java
@@ -81,9 +81,8 @@ private Elu(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Elu<T> create(Scope scope, Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Elu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Elu");
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Elu<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/EluGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/EluGrad.java
index 84b0f7a0232..01b0f59507a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/EluGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/EluGrad.java
@@ -59,10 +59,9 @@ private EluGrad(Operation operation) {
   )
   public static <T extends TNumber> EluGrad<T> create(Scope scope, Operand<T> gradients,
       Operand<T> outputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EluGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EluGrad");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(outputs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new EluGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FixedUnigramCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FixedUnigramCandidateSampler.java
index acfe0fe9a34..cd5a577fad0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FixedUnigramCandidateSampler.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FixedUnigramCandidateSampler.java
@@ -87,9 +87,8 @@ private FixedUnigramCandidateSampler(Operation operation) {
   )
   public static FixedUnigramCandidateSampler create(Scope scope, Operand<TInt64> trueClasses,
       Long numTrue, Long numSampled, Boolean unique, Long rangeMax, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FixedUnigramCandidateSampler"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FixedUnigramCandidateSampler");
     opBuilder.addInput(trueClasses.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_true", numTrue);
     opBuilder.setAttr("num_sampled", numSampled);
     opBuilder.setAttr("unique", unique);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPool.java
index 291d2c22ec6..ae6c9ebb5e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPool.java
@@ -81,9 +81,8 @@ private FractionalAvgPool(Operation operation) {
   )
   public static <T extends TNumber> FractionalAvgPool<T> create(Scope scope, Operand<T> value,
       List<Float> poolingRatio, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FractionalAvgPool"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FractionalAvgPool");
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     float[] poolingRatioArray = new float[poolingRatio.size()];
     for (int i = 0 ; i < poolingRatioArray.length ; i++) {
       poolingRatioArray[i] = poolingRatio.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPoolGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPoolGrad.java
index b3b5cdc8e49..c703f47835a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPoolGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPoolGrad.java
@@ -72,12 +72,11 @@ private FractionalAvgPoolGrad(Operation operation) {
   public static <T extends TNumber> FractionalAvgPoolGrad<T> create(Scope scope,
       Operand<TInt64> origInputTensorShape, Operand<T> outBackprop,
       Operand<TInt64> rowPoolingSequence, Operand<TInt64> colPoolingSequence, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FractionalAvgPoolGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FractionalAvgPoolGrad");
     opBuilder.addInput(origInputTensorShape.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
     opBuilder.addInput(rowPoolingSequence.asOutput());
     opBuilder.addInput(colPoolingSequence.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.overlapping != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPool.java
index 632f0ffab4b..44e4cd682c6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPool.java
@@ -103,9 +103,8 @@ private FractionalMaxPool(Operation operation) {
   )
   public static <T extends TNumber> FractionalMaxPool<T> create(Scope scope, Operand<T> value,
       List<Float> poolingRatio, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FractionalMaxPool"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FractionalMaxPool");
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     float[] poolingRatioArray = new float[poolingRatio.size()];
     for (int i = 0 ; i < poolingRatioArray.length ; i++) {
       poolingRatioArray[i] = poolingRatio.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPoolGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPoolGrad.java
index 9168aada03d..b9f75ea53bb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPoolGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPoolGrad.java
@@ -68,13 +68,12 @@ private FractionalMaxPoolGrad(Operation operation) {
   public static <T extends TNumber> FractionalMaxPoolGrad<T> create(Scope scope,
       Operand<T> origInput, Operand<T> origOutput, Operand<T> outBackprop,
       Operand<TInt64> rowPoolingSequence, Operand<TInt64> colPoolingSequence, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FractionalMaxPoolGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FractionalMaxPoolGrad");
     opBuilder.addInput(origInput.asOutput());
     opBuilder.addInput(origOutput.asOutput());
     opBuilder.addInput(outBackprop.asOutput());
     opBuilder.addInput(rowPoolingSequence.asOutput());
     opBuilder.addInput(colPoolingSequence.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.overlapping != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNorm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNorm.java
index be19069844a..b832e66d0f9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNorm.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNorm.java
@@ -90,13 +90,12 @@ private FusedBatchNorm(Operation operation) {
   public static <T extends TNumber, U extends TNumber> FusedBatchNorm<T, U> create(Scope scope,
       Operand<T> x, Operand<U> scale, Operand<U> offset, Operand<U> mean, Operand<U> variance,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FusedBatchNorm"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FusedBatchNorm");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(scale.asOutput());
     opBuilder.addInput(offset.asOutput());
     opBuilder.addInput(mean.asOutput());
     opBuilder.addInput(variance.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.epsilon != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNormGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNormGrad.java
index 8f70d25a40c..d72aa33d4ee 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNormGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNormGrad.java
@@ -96,14 +96,13 @@ private FusedBatchNormGrad(Operation operation) {
   public static <T extends TNumber, U extends TNumber> FusedBatchNormGrad<T, U> create(Scope scope,
       Operand<T> yBackprop, Operand<T> x, Operand<TFloat32> scale, Operand<U> reserveSpace1,
       Operand<U> reserveSpace2, Operand<U> reserveSpace3, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FusedBatchNormGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FusedBatchNormGrad");
     opBuilder.addInput(yBackprop.asOutput());
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(scale.asOutput());
     opBuilder.addInput(reserveSpace1.asOutput());
     opBuilder.addInput(reserveSpace2.asOutput());
     opBuilder.addInput(reserveSpace3.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.epsilon != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedPadConv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedPadConv2d.java
index 7ffb05c66d7..2ca95bdf8ed 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedPadConv2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedPadConv2d.java
@@ -84,11 +84,10 @@ private FusedPadConv2d(Operation operation) {
   public static <T extends TNumber> FusedPadConv2d<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> paddings, Operand<T> filter, String mode, List<Long> strides,
       String padding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FusedPadConv2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FusedPadConv2d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
     opBuilder.addInput(filter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("mode", mode);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedResizeAndPadConv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedResizeAndPadConv2d.java
index 1ec36de171c..85ede719c12 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedResizeAndPadConv2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedResizeAndPadConv2d.java
@@ -86,12 +86,11 @@ private FusedResizeAndPadConv2d(Operation operation) {
   public static <T extends TNumber> FusedResizeAndPadConv2d<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> sizeOutput, Operand<TInt32> paddings, Operand<T> filter, String mode,
       List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FusedResizeAndPadConv2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FusedResizeAndPadConv2d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(paddings.asOutput());
     opBuilder.addInput(filter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("mode", mode);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCell.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCell.java
index dc096503547..f097c11d9ba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCell.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCell.java
@@ -110,14 +110,13 @@ private GRUBlockCell(Operation operation) {
   )
   public static <T extends TNumber> GRUBlockCell<T> create(Scope scope, Operand<T> x,
       Operand<T> hPrev, Operand<T> wRu, Operand<T> wC, Operand<T> bRu, Operand<T> bC) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GRUBlockCell"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GRUBlockCell");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(hPrev.asOutput());
     opBuilder.addInput(wRu.asOutput());
     opBuilder.addInput(wC.asOutput());
     opBuilder.addInput(bRu.asOutput());
     opBuilder.addInput(bC.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new GRUBlockCell<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCellGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCellGrad.java
index 12503ae477d..7491f7e22d4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCellGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCellGrad.java
@@ -150,7 +150,7 @@ private GRUBlockCellGrad(Operation operation) {
   public static <T extends TNumber> GRUBlockCellGrad<T> create(Scope scope, Operand<T> x,
       Operand<T> hPrev, Operand<T> wRu, Operand<T> wC, Operand<T> bRu, Operand<T> bC, Operand<T> r,
       Operand<T> u, Operand<T> c, Operand<T> dH) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GRUBlockCellGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GRUBlockCellGrad");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(hPrev.asOutput());
     opBuilder.addInput(wRu.asOutput());
@@ -161,7 +161,6 @@ public static <T extends TNumber> GRUBlockCellGrad<T> create(Scope scope, Operan
     opBuilder.addInput(u.asOutput());
     opBuilder.addInput(c.asOutput());
     opBuilder.addInput(dH.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new GRUBlockCellGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InTopK.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InTopK.java
index 2d87109548b..f6ba25f9885 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InTopK.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InTopK.java
@@ -75,11 +75,10 @@ private InTopK(Operation operation) {
   )
   public static <T extends TNumber> InTopK create(Scope scope, Operand<TFloat32> predictions,
       Operand<T> targets, Operand<T> k) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InTopK"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InTopK");
     opBuilder.addInput(predictions.asOutput());
     opBuilder.addInput(targets.asOutput());
     opBuilder.addInput(k.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new InTopK(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InvGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InvGrad.java
index a65d21a2ca0..0e8c241594d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InvGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InvGrad.java
@@ -60,10 +60,9 @@ private InvGrad(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> InvGrad<T> create(Scope scope, Operand<T> y, Operand<T> dy) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InvGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InvGrad");
     opBuilder.addInput(y.asOutput());
     opBuilder.addInput(dy.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new InvGrad<>(opBuilder.build());
   }
 
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 9810a19768b..20b1c7f5145 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
@@ -65,9 +65,8 @@ private IsotonicRegression(Operation operation) {
   )
   public static <U extends TNumber> IsotonicRegression<U> create(Scope scope,
       Operand<? extends TNumber> input, Class<U> outputDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsotonicRegression"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "IsotonicRegression");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_dtype", Operands.toDataType(outputDtype));
     return new IsotonicRegression<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/L2Loss.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/L2Loss.java
index a85f32110f6..7f747028c27 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/L2Loss.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/L2Loss.java
@@ -65,9 +65,8 @@ private L2Loss(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> L2Loss<T> create(Scope scope, Operand<T> t) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("L2Loss"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "L2Loss");
     opBuilder.addInput(t.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new L2Loss<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCell.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCell.java
index f910a98be46..b64f2d1ad90 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCell.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCell.java
@@ -107,7 +107,7 @@ private LSTMBlockCell(Operation operation) {
   public static <T extends TNumber> LSTMBlockCell<T> create(Scope scope, Operand<T> x,
       Operand<T> csPrev, Operand<T> hPrev, Operand<T> w, Operand<T> wci, Operand<T> wcf,
       Operand<T> wco, Operand<T> b, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LSTMBlockCell"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LSTMBlockCell");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(csPrev.asOutput());
     opBuilder.addInput(hPrev.asOutput());
@@ -116,7 +116,6 @@ public static <T extends TNumber> LSTMBlockCell<T> create(Scope scope, Operand<T
     opBuilder.addInput(wcf.asOutput());
     opBuilder.addInput(wco.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.forgetBias != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCellGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCellGrad.java
index 1c5be476677..d2049d0183b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCellGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCellGrad.java
@@ -89,7 +89,7 @@ public static <T extends TNumber> LSTMBlockCellGrad<T> create(Scope scope, Opera
       Operand<T> csPrev, Operand<T> hPrev, Operand<T> w, Operand<T> wci, Operand<T> wcf,
       Operand<T> wco, Operand<T> b, Operand<T> i, Operand<T> cs, Operand<T> f, Operand<T> o,
       Operand<T> ci, Operand<T> co, Operand<T> csGrad, Operand<T> hGrad, Boolean usePeephole) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LSTMBlockCellGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LSTMBlockCellGrad");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(csPrev.asOutput());
     opBuilder.addInput(hPrev.asOutput());
@@ -106,7 +106,6 @@ public static <T extends TNumber> LSTMBlockCellGrad<T> create(Scope scope, Opera
     opBuilder.addInput(co.asOutput());
     opBuilder.addInput(csGrad.asOutput());
     opBuilder.addInput(hGrad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("use_peephole", usePeephole);
     return new LSTMBlockCellGrad<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LeakyRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LeakyRelu.java
index 102e339294a..1d13c658e78 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LeakyRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LeakyRelu.java
@@ -63,9 +63,8 @@ private LeakyRelu(Operation operation) {
   )
   public static <T extends TNumber> LeakyRelu<T> create(Scope scope, Operand<T> features,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LeakyRelu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LeakyRelu");
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.alpha != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LearnedUnigramCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LearnedUnigramCandidateSampler.java
index a4e0e02ac56..f9dede20ce7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LearnedUnigramCandidateSampler.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LearnedUnigramCandidateSampler.java
@@ -81,9 +81,8 @@ private LearnedUnigramCandidateSampler(Operation operation) {
   )
   public static LearnedUnigramCandidateSampler create(Scope scope, Operand<TInt64> trueClasses,
       Long numTrue, Long numSampled, Boolean unique, Long rangeMax, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LearnedUnigramCandidateSampler"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LearnedUnigramCandidateSampler");
     opBuilder.addInput(trueClasses.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_true", numTrue);
     opBuilder.setAttr("num_sampled", numSampled);
     opBuilder.setAttr("unique", unique);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalization.java
index aafc6033ad4..1fd9649c309 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalization.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalization.java
@@ -74,9 +74,8 @@ private LocalResponseNormalization(Operation operation) {
   )
   public static <T extends TNumber> LocalResponseNormalization<T> create(Scope scope,
       Operand<T> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LocalResponseNormalization"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LocalResponseNormalization");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.depthRadius != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalizationGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalizationGrad.java
index ef0017a4c90..57d51c9daf1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalizationGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalizationGrad.java
@@ -61,11 +61,10 @@ private LocalResponseNormalizationGrad(Operation operation) {
   )
   public static <T extends TNumber> LocalResponseNormalizationGrad<T> create(Scope scope,
       Operand<T> inputGrads, Operand<T> inputImage, Operand<T> outputImage, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LocalResponseNormalizationGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LocalResponseNormalizationGrad");
     opBuilder.addInput(inputGrads.asOutput());
     opBuilder.addInput(inputImage.asOutput());
     opBuilder.addInput(outputImage.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.depthRadius != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LogSoftmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LogSoftmax.java
index 699922585a8..a70ad1ba80d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LogSoftmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LogSoftmax.java
@@ -65,9 +65,8 @@ private LogSoftmax(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> LogSoftmax<T> create(Scope scope, Operand<T> logits) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogSoftmax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LogSoftmax");
     opBuilder.addInput(logits.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new LogSoftmax<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool.java
index 9079b0bd366..630374f0888 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool.java
@@ -68,11 +68,10 @@ private MaxPool(Operation operation) {
   )
   public static <T extends TNumber> MaxPool<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> ksize, Operand<TInt32> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPool"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPool");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(ksize.asOutput());
     opBuilder.addInput(strides.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("padding", padding);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3d.java
index 31cdd55de62..321a5dcb029 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3d.java
@@ -69,9 +69,8 @@ private MaxPool3d(Operation operation) {
   )
   public static <T extends TNumber> MaxPool3d<T> create(Scope scope, Operand<T> input,
       List<Long> ksize, List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPool3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPool3d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGrad.java
index 096e4b4369e..f3f0ec2b5cf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGrad.java
@@ -73,11 +73,10 @@ private MaxPool3dGrad(Operation operation) {
   public static <U extends TNumber, T extends TNumber> MaxPool3dGrad<U> create(Scope scope,
       Operand<T> origInput, Operand<T> origOutput, Operand<U> grad, List<Long> ksize,
       List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPool3dGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPool3dGrad");
     opBuilder.addInput(origInput.asOutput());
     opBuilder.addInput(origOutput.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGradGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGradGrad.java
index 3c5bbf30708..79673ef2121 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGradGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGradGrad.java
@@ -72,11 +72,10 @@ private MaxPool3dGradGrad(Operation operation) {
   public static <T extends TNumber> MaxPool3dGradGrad<T> create(Scope scope, Operand<T> origInput,
       Operand<T> origOutput, Operand<T> grad, List<Long> ksize, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPool3dGradGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPool3dGradGrad");
     opBuilder.addInput(origInput.asOutput());
     opBuilder.addInput(origOutput.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGrad.java
index e73b77b308c..60129b28217 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGrad.java
@@ -71,13 +71,12 @@ private MaxPoolGrad(Operation operation) {
   public static <T extends TNumber> MaxPoolGrad<T> create(Scope scope, Operand<T> origInput,
       Operand<T> origOutput, Operand<T> grad, Operand<TInt32> ksize, Operand<TInt32> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPoolGrad");
     opBuilder.addInput(origInput.asOutput());
     opBuilder.addInput(origOutput.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(ksize.asOutput());
     opBuilder.addInput(strides.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("padding", padding);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGrad.java
index d0bfcc9956a..7be3b57875e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGrad.java
@@ -71,13 +71,12 @@ private MaxPoolGradGrad(Operation operation) {
   public static <T extends TNumber> MaxPoolGradGrad<T> create(Scope scope, Operand<T> origInput,
       Operand<T> origOutput, Operand<T> grad, Operand<TInt32> ksize, Operand<TInt32> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolGradGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPoolGradGrad");
     opBuilder.addInput(origInput.asOutput());
     opBuilder.addInput(origOutput.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(ksize.asOutput());
     opBuilder.addInput(strides.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("padding", padding);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java
index 6a4d68fcab3..2e617fa36c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java
@@ -72,11 +72,10 @@ private MaxPoolGradGradWithArgmax(Operation operation) {
   public static <T extends TNumber> MaxPoolGradGradWithArgmax<T> create(Scope scope,
       Operand<T> input, Operand<T> grad, Operand<? extends TNumber> argmax, List<Long> ksize,
       List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolGradGradWithArgmax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPoolGradGradWithArgmax");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(argmax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java
index ca8153f86da..79d6a05146e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java
@@ -68,11 +68,10 @@ private MaxPoolGradWithArgmax(Operation operation) {
   public static <T extends TNumber> MaxPoolGradWithArgmax<T> create(Scope scope, Operand<T> input,
       Operand<T> grad, Operand<? extends TNumber> argmax, List<Long> ksize, List<Long> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolGradWithArgmax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPoolGradWithArgmax");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(argmax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolWithArgmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolWithArgmax.java
index d8682b8e4bf..f3685f3aa0e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolWithArgmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolWithArgmax.java
@@ -86,9 +86,8 @@ private MaxPoolWithArgmax(Operation operation) {
   public static <T extends TNumber, U extends TNumber> MaxPoolWithArgmax<T, U> create(Scope scope,
       Operand<T> input, List<Long> ksize, List<Long> strides, Class<U> Targmax, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolWithArgmax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MaxPoolWithArgmax");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/NthElement.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/NthElement.java
index 7ed8fee52d3..47f38a213fb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/NthElement.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/NthElement.java
@@ -73,10 +73,9 @@ private NthElement(Operation operation) {
   )
   public static <T extends TNumber> NthElement<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> n, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NthElement"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NthElement");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(n.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.reverse != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedAvgPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedAvgPool.java
index b33fc36e608..d9ae295a485 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedAvgPool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedAvgPool.java
@@ -78,11 +78,10 @@ private QuantizedAvgPool(Operation operation) {
   public static <T extends TNumber> QuantizedAvgPool<T> create(Scope scope, Operand<T> input,
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, List<Long> ksize, List<Long> strides,
       String padding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedAvgPool"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedAvgPool");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(minInput.asOutput());
     opBuilder.addInput(maxInput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBatchNormWithGlobalNormalization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBatchNormWithGlobalNormalization.java
index ddc13f90224..f7d54b8efa4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBatchNormWithGlobalNormalization.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBatchNormWithGlobalNormalization.java
@@ -102,7 +102,7 @@ public static <U extends TNumber, T extends TNumber> QuantizedBatchNormWithGloba
       Operand<TFloat32> vMax, Operand<T> beta, Operand<TFloat32> betaMin, Operand<TFloat32> betaMax,
       Operand<T> gamma, Operand<TFloat32> gammaMin, Operand<TFloat32> gammaMax, Class<U> outType,
       Float varianceEpsilon, Boolean scaleAfterNormalization) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedBatchNormWithGlobalNormalization"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedBatchNormWithGlobalNormalization");
     opBuilder.addInput(t.asOutput());
     opBuilder.addInput(tMin.asOutput());
     opBuilder.addInput(tMax.asOutput());
@@ -118,7 +118,6 @@ public static <U extends TNumber, T extends TNumber> QuantizedBatchNormWithGloba
     opBuilder.addInput(gamma.asOutput());
     opBuilder.addInput(gammaMin.asOutput());
     opBuilder.addInput(gammaMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     opBuilder.setAttr("variance_epsilon", varianceEpsilon);
     opBuilder.setAttr("scale_after_normalization", scaleAfterNormalization);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java
index cb1e586f257..ac9a8fc2861 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java
@@ -79,14 +79,13 @@ public static <V extends TNumber> QuantizedBiasAdd<V> create(Scope scope,
       Operand<? extends TNumber> input, Operand<? extends TNumber> bias, Operand<TFloat32> minInput,
       Operand<TFloat32> maxInput, Operand<TFloat32> minBias, Operand<TFloat32> maxBias,
       Class<V> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedBiasAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedBiasAdd");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(bias.asOutput());
     opBuilder.addInput(minInput.asOutput());
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minBias.asOutput());
     opBuilder.addInput(maxBias.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new QuantizedBiasAdd<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java
index 17df774e266..c7980b56a44 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java
@@ -80,14 +80,13 @@ public static <V extends TNumber> QuantizedConv2DAndRelu<V> create(Scope scope,
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DAndRelu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DAndRelu");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(minInput.asOutput());
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java
index aff2a5fa3ba..e4adb5cf7f9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java
@@ -83,7 +83,7 @@ public static <V extends TNumber> QuantizedConv2DAndReluAndRequantize<V> create(
       Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput,
       Operand<TFloat32> maxFreezedOutput, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DAndReluAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DAndReluAndRequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(minInput.asOutput());
@@ -92,7 +92,6 @@ public static <V extends TNumber> QuantizedConv2DAndReluAndRequantize<V> create(
     opBuilder.addInput(maxFilter.asOutput());
     opBuilder.addInput(minFreezedOutput.asOutput());
     opBuilder.addInput(maxFreezedOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java
index ff848ffe752..c4f415ebf8a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java
@@ -83,7 +83,7 @@ public static <V extends TNumber> QuantizedConv2DAndRequantize<V> create(Scope s
       Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput,
       Operand<TFloat32> maxFreezedOutput, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DAndRequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(minInput.asOutput());
@@ -92,7 +92,6 @@ public static <V extends TNumber> QuantizedConv2DAndRequantize<V> create(Scope s
     opBuilder.addInput(maxFilter.asOutput());
     opBuilder.addInput(minFreezedOutput.asOutput());
     opBuilder.addInput(maxFreezedOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java
index db50edce61d..eb8860fde35 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java
@@ -80,14 +80,13 @@ public static <V extends TNumber> QuantizedConv2DPerChannel<V> create(Scope scop
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DPerChannel"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DPerChannel");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(minInput.asOutput());
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java
index bab9a335a71..ccdd59f9d22 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java
@@ -81,7 +81,7 @@ public static <V extends TNumber> QuantizedConv2DWithBias<V> create(Scope scope,
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBias"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DWithBias");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -89,7 +89,6 @@ public static <V extends TNumber> QuantizedConv2DWithBias<V> create(Scope scope,
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java
index 2fd266645ce..591734ef5f1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java
@@ -81,7 +81,7 @@ public static <V extends TNumber> QuantizedConv2DWithBiasAndRelu<V> create(Scope
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasAndRelu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DWithBiasAndRelu");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -89,7 +89,6 @@ public static <V extends TNumber> QuantizedConv2DWithBiasAndRelu<V> create(Scope
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java
index f2675f3d14b..238d0e6a440 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java
@@ -84,7 +84,7 @@ public static <W extends TNumber> QuantizedConv2DWithBiasAndReluAndRequantize<W>
       Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput,
       Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasAndReluAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DWithBiasAndReluAndRequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -94,7 +94,6 @@ public static <W extends TNumber> QuantizedConv2DWithBiasAndReluAndRequantize<W>
     opBuilder.addInput(maxFilter.asOutput());
     opBuilder.addInput(minFreezedOutput.asOutput());
     opBuilder.addInput(maxFreezedOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java
index 87c648079e2..cceca8676b0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java
@@ -84,7 +84,7 @@ public static <W extends TNumber> QuantizedConv2DWithBiasAndRequantize<W> create
       Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput,
       Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DWithBiasAndRequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -94,7 +94,6 @@ public static <W extends TNumber> QuantizedConv2DWithBiasAndRequantize<W> create
     opBuilder.addInput(maxFilter.asOutput());
     opBuilder.addInput(minFreezedOutput.asOutput());
     opBuilder.addInput(maxFreezedOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java
index f8db22536e2..07979421f05 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java
@@ -88,7 +88,7 @@ public static <X extends TNumber> QuantizedConv2DWithBiasSignedSumAndReluAndRequ
       Operand<TFloat32> maxFreezedOutput, Operand<? extends TNumber> summand,
       Operand<TFloat32> minSummand, Operand<TFloat32> maxSummand, Class<X> outType,
       List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasSignedSumAndReluAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DWithBiasSignedSumAndReluAndRequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -101,7 +101,6 @@ public static <X extends TNumber> QuantizedConv2DWithBiasSignedSumAndReluAndRequ
     opBuilder.addInput(summand.asOutput());
     opBuilder.addInput(minSummand.asOutput());
     opBuilder.addInput(maxSummand.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java
index 90d4172060d..3ae339e9774 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java
@@ -82,7 +82,7 @@ public static <V extends TNumber> QuantizedConv2DWithBiasSumAndRelu<V> create(Sc
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Operand<TFloat32> summand, Class<V> outType, List<Long> strides,
       String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasSumAndRelu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DWithBiasSumAndRelu");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -91,7 +91,6 @@ public static <V extends TNumber> QuantizedConv2DWithBiasSumAndRelu<V> create(Sc
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
     opBuilder.addInput(summand.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java
index fb302d2676a..53be5e9f6b0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java
@@ -88,7 +88,7 @@ public static <X extends TNumber> QuantizedConv2DWithBiasSumAndReluAndRequantize
       Operand<TFloat32> maxFreezedOutput, Operand<? extends TNumber> summand,
       Operand<TFloat32> minSummand, Operand<TFloat32> maxSummand, Class<X> outType,
       List<Long> strides, String padding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasSumAndReluAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2DWithBiasSumAndReluAndRequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -101,7 +101,6 @@ public static <X extends TNumber> QuantizedConv2DWithBiasSumAndReluAndRequantize
     opBuilder.addInput(summand.asOutput());
     opBuilder.addInput(minSummand.asOutput());
     opBuilder.addInput(maxSummand.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java
index 1074cf9f002..3dabec4356c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java
@@ -89,14 +89,13 @@ public static <V extends TNumber> QuantizedConv2d<V> create(Scope scope,
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConv2d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(minInput.asOutput());
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java
index 126a89aa6b7..4c830ea0e04 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java
@@ -80,14 +80,13 @@ public static <V extends TNumber> QuantizedDepthwiseConv2D<V> create(Scope scope
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedDepthwiseConv2D"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedDepthwiseConv2D");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(minInput.asOutput());
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java
index e8672cdcd8e..b408de31728 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java
@@ -81,7 +81,7 @@ public static <V extends TNumber> QuantizedDepthwiseConv2DWithBias<V> create(Sco
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedDepthwiseConv2DWithBias"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedDepthwiseConv2DWithBias");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -89,7 +89,6 @@ public static <V extends TNumber> QuantizedDepthwiseConv2DWithBias<V> create(Sco
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java
index 43163c51c44..70d0b72d0d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java
@@ -81,7 +81,7 @@ public static <V extends TNumber> QuantizedDepthwiseConv2DWithBiasAndRelu<V> cre
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, Operand<TFloat32> minFilter,
       Operand<TFloat32> maxFilter, Class<V> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndRelu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedDepthwiseConv2DWithBiasAndRelu");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -89,7 +89,6 @@ public static <V extends TNumber> QuantizedDepthwiseConv2DWithBiasAndRelu<V> cre
     opBuilder.addInput(maxInput.asOutput());
     opBuilder.addInput(minFilter.asOutput());
     opBuilder.addInput(maxFilter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java
index b330f7609c0..42c8519fdac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java
@@ -84,7 +84,7 @@ public static <W extends TNumber> QuantizedDepthwiseConv2DWithBiasAndReluAndRequ
       Operand<TFloat32> minFilter, Operand<TFloat32> maxFilter, Operand<TFloat32> minFreezedOutput,
       Operand<TFloat32> maxFreezedOutput, Class<W> outType, List<Long> strides, String padding,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -94,7 +94,6 @@ public static <W extends TNumber> QuantizedDepthwiseConv2DWithBiasAndReluAndRequ
     opBuilder.addInput(maxFilter.asOutput());
     opBuilder.addInput(minFreezedOutput.asOutput());
     opBuilder.addInput(maxFreezedOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedInstanceNorm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedInstanceNorm.java
index b357e42f390..7c7ccfe2d62 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedInstanceNorm.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedInstanceNorm.java
@@ -72,11 +72,10 @@ private QuantizedInstanceNorm(Operation operation) {
   )
   public static <T extends TNumber> QuantizedInstanceNorm<T> create(Scope scope, Operand<T> x,
       Operand<TFloat32> xMin, Operand<TFloat32> xMax, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedInstanceNorm"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedInstanceNorm");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(xMin.asOutput());
     opBuilder.addInput(xMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.outputRangeGiven != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedMaxPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedMaxPool.java
index e37245fdd42..9e31416dc48 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedMaxPool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedMaxPool.java
@@ -78,11 +78,10 @@ private QuantizedMaxPool(Operation operation) {
   public static <T extends TNumber> QuantizedMaxPool<T> create(Scope scope, Operand<T> input,
       Operand<TFloat32> minInput, Operand<TFloat32> maxInput, List<Long> ksize, List<Long> strides,
       String padding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMaxPool"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedMaxPool");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(minInput.asOutput());
     opBuilder.addInput(maxInput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java
index b060f82abe6..a8021cf2c53 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java
@@ -74,11 +74,10 @@ private QuantizedRelu(Operation operation) {
   public static <U extends TNumber> QuantizedRelu<U> create(Scope scope,
       Operand<? extends TNumber> features, Operand<TFloat32> minFeatures,
       Operand<TFloat32> maxFeatures, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedRelu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedRelu");
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(minFeatures.asOutput());
     opBuilder.addInput(maxFeatures.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new QuantizedRelu<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java
index 2f865eb4ad1..713f3e800c3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java
@@ -74,11 +74,10 @@ private QuantizedRelu6(Operation operation) {
   public static <U extends TNumber> QuantizedRelu6<U> create(Scope scope,
       Operand<? extends TNumber> features, Operand<TFloat32> minFeatures,
       Operand<TFloat32> maxFeatures, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedRelu6"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedRelu6");
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(minFeatures.asOutput());
     opBuilder.addInput(maxFeatures.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new QuantizedRelu6<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java
index 36809492c69..199e22b049c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java
@@ -75,12 +75,11 @@ private QuantizedReluX(Operation operation) {
   public static <U extends TNumber> QuantizedReluX<U> create(Scope scope,
       Operand<? extends TNumber> features, Operand<TFloat32> maxValue,
       Operand<TFloat32> minFeatures, Operand<TFloat32> maxFeatures, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedReluX"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedReluX");
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(maxValue.asOutput());
     opBuilder.addInput(minFeatures.asOutput());
     opBuilder.addInput(maxFeatures.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new QuantizedReluX<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu.java
index 4bae9944d20..cbf2f6c2278 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu.java
@@ -71,9 +71,8 @@ private Relu(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Relu<T> create(Scope scope, Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Relu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Relu");
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Relu<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6.java
index b710f942761..0e31636c3cf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6.java
@@ -61,9 +61,8 @@ private Relu6(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Relu6<T> create(Scope scope, Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Relu6"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Relu6");
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Relu6<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6Grad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6Grad.java
index 660dcb7085a..5ec8c04501c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6Grad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6Grad.java
@@ -60,10 +60,9 @@ private Relu6Grad(Operation operation) {
   )
   public static <T extends TNumber> Relu6Grad<T> create(Scope scope, Operand<T> gradients,
       Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Relu6Grad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Relu6Grad");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Relu6Grad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ReluGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ReluGrad.java
index 92788e886ae..3e0eacee22d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ReluGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ReluGrad.java
@@ -60,10 +60,9 @@ private ReluGrad(Operation operation) {
   )
   public static <T extends TNumber> ReluGrad<T> create(Scope scope, Operand<T> gradients,
       Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReluGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReluGrad");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ReluGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Selu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Selu.java
index ca3357fdff1..d05637ab93c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Selu.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Selu.java
@@ -66,9 +66,8 @@ private Selu(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Selu<T> create(Scope scope, Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Selu"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Selu");
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Selu<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SeluGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SeluGrad.java
index 66a4c89806f..5516e9bd369 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SeluGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SeluGrad.java
@@ -59,10 +59,9 @@ private SeluGrad(Operation operation) {
   )
   public static <T extends TNumber> SeluGrad<T> create(Scope scope, Operand<T> gradients,
       Operand<T> outputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SeluGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SeluGrad");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(outputs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SeluGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softmax.java
index bd7f8c0f9c0..306bcc22794 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softmax.java
@@ -65,9 +65,8 @@ private Softmax(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Softmax<T> create(Scope scope, Operand<T> logits) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Softmax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Softmax");
     opBuilder.addInput(logits.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Softmax<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftmaxCrossEntropyWithLogits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftmaxCrossEntropyWithLogits.java
index 8c3ef2da29a..d703a649978 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftmaxCrossEntropyWithLogits.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftmaxCrossEntropyWithLogits.java
@@ -50,7 +50,7 @@ private SoftmaxCrossEntropyWithLogits(Operation operation) {
     super(operation);
     int outputIdx = 0;
     loss = operation.output(outputIdx++);
-    backprop = operation.output(outputIdx);
+    backprop = operation.output(outputIdx++);
   }
 
   /**
@@ -69,10 +69,9 @@ private SoftmaxCrossEntropyWithLogits(Operation operation) {
   )
   public static <T extends TNumber> SoftmaxCrossEntropyWithLogits<T> create(Scope scope,
       Operand<T> features, Operand<T> labels) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SoftmaxCrossEntropyWithLogits"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SoftmaxCrossEntropyWithLogits");
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(labels.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SoftmaxCrossEntropyWithLogits<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softsign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softsign.java
index 0fe94d6659e..67fa8f4211a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softsign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softsign.java
@@ -61,9 +61,8 @@ private Softsign(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> Softsign<T> create(Scope scope, Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Softsign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Softsign");
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Softsign<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftsignGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftsignGrad.java
index 45de76bc54f..c73893bd640 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftsignGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftsignGrad.java
@@ -59,10 +59,9 @@ private SoftsignGrad(Operation operation) {
   )
   public static <T extends TNumber> SoftsignGrad<T> create(Scope scope, Operand<T> gradients,
       Operand<T> features) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SoftsignGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SoftsignGrad");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(features.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SoftsignGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java
index 0b29e7b9afe..66ac883c8a6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java
@@ -36,6 +36,64 @@
  * the {@code height} and {@code width} dimensions are moved to the {@code batch} dimension. After
  * the zero-padding, both {@code height} and {@code width} of the input must be divisible by the
  * block size.
+ * <p>The attr {@code block_size} must be greater than one. It indicates the block size.
+ * <ul>
+ * <li>Non-overlapping blocks of size {@code block_size x block size} in the height and
+ * width dimensions are rearranged into the batch dimension at each location.</li>
+ * <li>The batch of the output tensor is {@code batch * block_size * block_size}.</li>
+ * <li>Both height_pad and width_pad must be divisible by block_size.</li>
+ * </ul>
+ * <p>The shape of the output will be:
+ * <pre>
+ * [batch*block_size*block_size, height_pad/block_size, width_pad/block_size,
+ *  depth]
+ * </pre>
+ * <p>Some examples:
+ * <p>(1) For the following input of shape {@code [1, 2, 2, 1]} and block_size of 2:
+ * <pre>
+ * x = [[[[1], [2]], [[3], [4]]]]
+ * </pre>
+ * <p>The output tensor has shape {@code [4, 1, 1, 1]} and value:
+ * <pre>
+ * [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
+ * </pre>
+ * <p>(2) For the following input of shape {@code [1, 2, 2, 3]} and block_size of 2:
+ * <pre>
+ * x = [[[[1, 2, 3], [4, 5, 6]],
+ *       [[7, 8, 9], [10, 11, 12]]]]
+ * </pre>
+ * <p>The output tensor has shape {@code [4, 1, 1, 3]} and value:
+ * <pre>
+ * [[[[1, 2, 3]]], [[[4, 5, 6]]], [[[7, 8, 9]]], [[[10, 11, 12]]]]
+ * </pre>
+ * <p>(3) For the following input of shape {@code [1, 4, 4, 1]} and block_size of 2:
+ * <pre>
+ * x = [[[[1],   [2],  [3],  [4]],
+ *       [[5],   [6],  [7],  [8]],
+ *       [[9],  [10], [11],  [12]],
+ *       [[13], [14], [15],  [16]]]]
+ * </pre>
+ * <p>The output tensor has shape {@code [4, 2, 2, 1]} and value:
+ * <pre>
+ * x = [[[[1], [3]], [[9], [11]]],
+ *      [[[2], [4]], [[10], [12]]],
+ *      [[[5], [7]], [[13], [15]]],
+ *      [[[6], [8]], [[14], [16]]]]
+ * </pre>
+ * <p>(4) For the following input of shape {@code [2, 2, 4, 1]} and block_size of 2:
+ * <pre>
+ * x = [[[[1],   [2],  [3],  [4]],
+ *       [[5],   [6],  [7],  [8]]],
+ *      [[[9],  [10], [11],  [12]],
+ *       [[13], [14], [15],  [16]]]]
+ * </pre>
+ * <p>The output tensor has shape {@code [8, 1, 2, 1]} and value:
+ * <pre>
+ * x = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],
+ *      [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]
+ * </pre>
+ * <p>Among others, this operation is useful for reducing atrous convolution into
+ * regular convolution.
  *
  * @param <T> data type for {@code output} output
  */
@@ -71,64 +129,6 @@ private SpaceToBatch(Operation operation) {
    *   height_pad = pad_top + height + pad_bottom
    *   width_pad = pad_left + width + pad_right
    * </pre>
-   * <p>The attr {@code block_size} must be greater than one. It indicates the block size.
-   * <ul>
-   * <li>Non-overlapping blocks of size {@code block_size x block size} in the height and
-   * width dimensions are rearranged into the batch dimension at each location.</li>
-   * <li>The batch of the output tensor is {@code batch * block_size * block_size}.</li>
-   * <li>Both height_pad and width_pad must be divisible by block_size.</li>
-   * </ul>
-   * <p>The shape of the output will be:
-   * <pre>
-   * [batch*block_size*block_size, height_pad/block_size, width_pad/block_size,
-   *  depth]
-   * </pre>
-   * <p>Some examples:
-   * <p>(1) For the following input of shape {@code [1, 2, 2, 1]} and block_size of 2:
-   * <pre>
-   * x = [[[[1], [2]], [[3], [4]]]]
-   * </pre>
-   * <p>The output tensor has shape {@code [4, 1, 1, 1]} and value:
-   * <pre>
-   * [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
-   * </pre>
-   * <p>(2) For the following input of shape {@code [1, 2, 2, 3]} and block_size of 2:
-   * <pre>
-   * x = [[[[1, 2, 3], [4, 5, 6]],
-   *       [[7, 8, 9], [10, 11, 12]]]]
-   * </pre>
-   * <p>The output tensor has shape {@code [4, 1, 1, 3]} and value:
-   * <pre>
-   * [[[[1, 2, 3]]], [[[4, 5, 6]]], [[[7, 8, 9]]], [[[10, 11, 12]]]]
-   * </pre>
-   * <p>(3) For the following input of shape {@code [1, 4, 4, 1]} and block_size of 2:
-   * <pre>
-   * x = [[[[1],   [2],  [3],  [4]],
-   *       [[5],   [6],  [7],  [8]],
-   *       [[9],  [10], [11],  [12]],
-   *       [[13], [14], [15],  [16]]]]
-   * </pre>
-   * <p>The output tensor has shape {@code [4, 2, 2, 1]} and value:
-   * <pre>
-   * x = [[[[1], [3]], [[9], [11]]],
-   *      [[[2], [4]], [[10], [12]]],
-   *      [[[5], [7]], [[13], [15]]],
-   *      [[[6], [8]], [[14], [16]]]]
-   * </pre>
-   * <p>(4) For the following input of shape {@code [2, 2, 4, 1]} and block_size of 2:
-   * <pre>
-   * x = [[[[1],   [2],  [3],  [4]],
-   *       [[5],   [6],  [7],  [8]]],
-   *      [[[9],  [10], [11],  [12]],
-   *       [[13], [14], [15],  [16]]]]
-   * </pre>
-   * <p>The output tensor has shape {@code [8, 1, 2, 1]} and value:
-   * <pre>
-   * x = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],
-   *      [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]
-   * </pre>
-   * <p>Among others, this operation is useful for reducing atrous convolution into
-   * regular convolution.
    * @param blockSize the value of the blockSize property
    * @param <T> data type for {@code SpaceToBatch} output and operands
    * @return a new instance of SpaceToBatch
@@ -138,10 +138,9 @@ private SpaceToBatch(Operation operation) {
   )
   public static <T extends TType> SpaceToBatch<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> paddings, Long blockSize) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SpaceToBatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SpaceToBatch");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("block_size", blockSize);
     return new SpaceToBatch<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToDepth.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToDepth.java
index e1fa58d4ff1..2c15ddacb58 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToDepth.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToDepth.java
@@ -132,9 +132,8 @@ private SpaceToDepth(Operation operation) {
   )
   public static <T extends TType> SpaceToDepth<T> create(Scope scope, Operand<T> input,
       Long blockSize, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SpaceToDepth"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SpaceToDepth");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("block_size", blockSize);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SparseSoftmaxCrossEntropyWithLogits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SparseSoftmaxCrossEntropyWithLogits.java
index 84feae55726..399274a39d7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SparseSoftmaxCrossEntropyWithLogits.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SparseSoftmaxCrossEntropyWithLogits.java
@@ -54,7 +54,7 @@ private SparseSoftmaxCrossEntropyWithLogits(Operation operation) {
     super(operation);
     int outputIdx = 0;
     loss = operation.output(outputIdx++);
-    backprop = operation.output(outputIdx);
+    backprop = operation.output(outputIdx++);
   }
 
   /**
@@ -72,10 +72,9 @@ private SparseSoftmaxCrossEntropyWithLogits(Operation operation) {
   )
   public static <T extends TNumber> SparseSoftmaxCrossEntropyWithLogits<T> create(Scope scope,
       Operand<T> features, Operand<? extends TNumber> labels) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSoftmaxCrossEntropyWithLogits"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSoftmaxCrossEntropyWithLogits");
     opBuilder.addInput(features.asOutput());
     opBuilder.addInput(labels.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSoftmaxCrossEntropyWithLogits<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java
index 6da2e8816a8..f7ecda41e2c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java
@@ -78,10 +78,9 @@ private TopK(Operation operation) {
   )
   public static <T extends TNumber> TopK<T> create(Scope scope, Operand<T> input, Operand<TInt32> k,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TopK"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TopK");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(k.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.sorted != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java
index faab6105ce4..9d4c2e4cbea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java
@@ -113,11 +113,10 @@ private Dequantize(Operation operation) {
   public static <U extends TNumber> Dequantize<U> create(Scope scope,
       Operand<? extends TNumber> input, Operand<TFloat32> minRange, Operand<TFloat32> maxRange,
       Class<U> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Dequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(minRange.asOutput());
     opBuilder.addInput(maxRange.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgs.java
index b56ea653c7a..aeb3f5bfbba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgs.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgs.java
@@ -80,9 +80,8 @@ private FakeQuantWithMinMaxArgs(Operation operation) {
   )
   public static FakeQuantWithMinMaxArgs create(Scope scope, Operand<TFloat32> inputs,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxArgs"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FakeQuantWithMinMaxArgs");
     opBuilder.addInput(inputs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.min != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgsGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgsGradient.java
index e7cdd673eda..e02dbb09041 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgsGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgsGradient.java
@@ -61,10 +61,9 @@ private FakeQuantWithMinMaxArgsGradient(Operation operation) {
   )
   public static FakeQuantWithMinMaxArgsGradient create(Scope scope, Operand<TFloat32> gradients,
       Operand<TFloat32> inputs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxArgsGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FakeQuantWithMinMaxArgsGradient");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(inputs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.min != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVars.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVars.java
index 81ac8d7d52a..718a9acfb6a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVars.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVars.java
@@ -85,11 +85,10 @@ private FakeQuantWithMinMaxVars(Operation operation) {
   )
   public static FakeQuantWithMinMaxVars create(Scope scope, Operand<TFloat32> inputs,
       Operand<TFloat32> min, Operand<TFloat32> max, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxVars"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FakeQuantWithMinMaxVars");
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(min.asOutput());
     opBuilder.addInput(max.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.numBits != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsGradient.java
index 66a5e18efe0..c7f5e1eff1c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsGradient.java
@@ -70,12 +70,11 @@ private FakeQuantWithMinMaxVarsGradient(Operation operation) {
   )
   public static FakeQuantWithMinMaxVarsGradient create(Scope scope, Operand<TFloat32> gradients,
       Operand<TFloat32> inputs, Operand<TFloat32> min, Operand<TFloat32> max, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxVarsGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FakeQuantWithMinMaxVarsGradient");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(min.asOutput());
     opBuilder.addInput(max.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.numBits != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannel.java
index 61c59c23a0d..9ebe8dc4567 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannel.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannel.java
@@ -86,11 +86,10 @@ private FakeQuantWithMinMaxVarsPerChannel(Operation operation) {
   )
   public static FakeQuantWithMinMaxVarsPerChannel create(Scope scope, Operand<TFloat32> inputs,
       Operand<TFloat32> min, Operand<TFloat32> max, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxVarsPerChannel"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FakeQuantWithMinMaxVarsPerChannel");
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(min.asOutput());
     opBuilder.addInput(max.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.numBits != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannelGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannelGradient.java
index e07a811035b..66b9e432de6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannelGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannelGradient.java
@@ -73,12 +73,11 @@ private FakeQuantWithMinMaxVarsPerChannelGradient(Operation operation) {
   public static FakeQuantWithMinMaxVarsPerChannelGradient create(Scope scope,
       Operand<TFloat32> gradients, Operand<TFloat32> inputs, Operand<TFloat32> min,
       Operand<TFloat32> max, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxVarsPerChannelGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FakeQuantWithMinMaxVarsPerChannelGradient");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(min.asOutput());
     opBuilder.addInput(max.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.numBits != null) {
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 6c63f3ec77d..7710a448c9a 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
@@ -171,11 +171,10 @@ private Quantize(Operation operation) {
   )
   public static <T extends TNumber> Quantize<T> create(Scope scope, Operand<TFloat32> input,
       Operand<TFloat32> minRange, Operand<TFloat32> maxRange, Class<T> T, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Quantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Quantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(minRange.asOutput());
     opBuilder.addInput(maxRange.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("T", Operands.toDataType(T));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantize.java
index 314b577d96d..e5bd785c488 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantize.java
@@ -69,12 +69,11 @@ private QuantizeAndDequantize(Operation operation) {
   )
   public static <T extends TNumber> QuantizeAndDequantize<T> create(Scope scope, Operand<T> input,
       Operand<T> inputMin, Operand<T> inputMax, Operand<TInt32> numBits, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeAndDequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizeAndDequantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
     opBuilder.addInput(numBits.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.signedInput != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV3.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV3.java
index ad04f64d628..475443feab6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV3.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV3.java
@@ -69,12 +69,11 @@ private QuantizeAndDequantizeV3(Operation operation) {
   )
   public static <T extends TNumber> QuantizeAndDequantizeV3<T> create(Scope scope, Operand<T> input,
       Operand<T> inputMin, Operand<T> inputMax, Operand<TInt32> numBits, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeAndDequantizeV3"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizeAndDequantizeV3");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
     opBuilder.addInput(numBits.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.signedInput != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4.java
index 0d51a0020b2..61c58c8c21c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4.java
@@ -28,7 +28,7 @@
 import org.tensorflow.types.family.TNumber;
 
 /**
- * Returns the gradient of {@code quantization.QuantizeAndDequantizeV4}.
+ * Quantizes then dequantizes a tensor.
  * This is almost identical to QuantizeAndDequantizeV2, except that it returns a
  * gradient of 1 for inputs that are within the quantization range, or 0 otherwise.
  *
@@ -55,9 +55,13 @@ private QuantizeAndDequantizeV4(Operation operation) {
    * Factory method to create a class wrapping a new QuantizeAndDequantizeV4 operation.
    *
    * @param scope current scope
-   * @param input the input value
-   * @param inputMin the inputMin value
-   * @param inputMax the inputMax value
+   * @param input Tensor to quantize and then dequantize.
+   * @param inputMin If {@code range_given == True}, this specifies the minimum input value that needs to
+   * be represented, otherwise it is determined from the min value of the {@code input}
+   * tensor.
+   * @param inputMax If {@code range_given == True}, this specifies the maximum input value that needs to
+   * be represented, otherwise it is determined from the max value of the {@code input}
+   * tensor.
    * @param options carries optional attribute values
    * @param <T> data type for {@code QuantizeAndDequantizeV4} output and operands
    * @return a new instance of QuantizeAndDequantizeV4
@@ -67,11 +71,10 @@ private QuantizeAndDequantizeV4(Operation operation) {
   )
   public static <T extends TNumber> QuantizeAndDequantizeV4<T> create(Scope scope, Operand<T> input,
       Operand<T> inputMin, Operand<T> inputMax, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeAndDequantizeV4"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizeAndDequantizeV4");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.signedInput != null) {
@@ -100,7 +103,8 @@ public static <T extends TNumber> QuantizeAndDequantizeV4<T> create(Scope scope,
   /**
    * Sets the signedInput option.
    *
-   * @param signedInput the signedInput option
+   * @param signedInput Whether the quantization is signed or unsigned. (actually this parameter should
+   * have been called <b>{@code signed_output}&lt;/b&gt;)
    * @return this Options instance.
    */
   public static Options signedInput(Boolean signedInput) {
@@ -110,7 +114,7 @@ public static Options signedInput(Boolean signedInput) {
   /**
    * Sets the numBits option.
    *
-   * @param numBits the numBits option
+   * @param numBits The bitwidth of the quantization.
    * @return this Options instance.
    */
   public static Options numBits(Long numBits) {
@@ -120,7 +124,7 @@ public static Options numBits(Long numBits) {
   /**
    * Sets the rangeGiven option.
    *
-   * @param rangeGiven the rangeGiven option
+   * @param rangeGiven Whether the range is given or should be determined from the {@code input} tensor.
    * @return this Options instance.
    */
   public static Options rangeGiven(Boolean rangeGiven) {
@@ -130,7 +134,14 @@ public static Options rangeGiven(Boolean rangeGiven) {
   /**
    * Sets the roundMode option.
    *
-   * @param roundMode the roundMode option
+   * @param roundMode The 'round_mode' attribute controls which rounding tie-breaking algorithm is
+   * used when rounding float values to their quantized equivalents. The following
+   * rounding modes are currently supported:
+   * <ul>
+   * <li>HALF_TO_EVEN: this is the default round_mode.</li>
+   * <li>HALF_UP: round towards positive. In this mode 7.5 rounds up to 8 and -7.5
+   * rounds up to -7.</li>
+   * </ul>
    * @return this Options instance.
    */
   public static Options roundMode(String roundMode) {
@@ -140,7 +151,9 @@ public static Options roundMode(String roundMode) {
   /**
    * Sets the narrowRange option.
    *
-   * @param narrowRange the narrowRange option
+   * @param narrowRange If True, then the absolute value of the quantized minimum value is the same as
+   * the quantized maximum value, instead of 1 greater.
+   * i.e. for 8 bit quantization, the minimum value is -127 instead of -128.
    * @return this Options instance.
    */
   public static Options narrowRange(Boolean narrowRange) {
@@ -150,7 +163,8 @@ public static Options narrowRange(Boolean narrowRange) {
   /**
    * Sets the axis option.
    *
-   * @param axis the axis option
+   * @param axis If specified, this axis is treated as a channel or slice axis, and a separate
+   * quantization range is used for each channel or slice along this axis.
    * @return this Options instance.
    */
   public static Options axis(Long axis) {
@@ -193,7 +207,8 @@ private Options() {
     /**
      * Sets the signedInput option.
      *
-     * @param signedInput the signedInput option
+     * @param signedInput Whether the quantization is signed or unsigned. (actually this parameter should
+     * have been called <b>{@code signed_output}&lt;/b&gt;)
      * @return this Options instance.
      */
     public Options signedInput(Boolean signedInput) {
@@ -204,7 +219,7 @@ public Options signedInput(Boolean signedInput) {
     /**
      * Sets the numBits option.
      *
-     * @param numBits the numBits option
+     * @param numBits The bitwidth of the quantization.
      * @return this Options instance.
      */
     public Options numBits(Long numBits) {
@@ -215,7 +230,7 @@ public Options numBits(Long numBits) {
     /**
      * Sets the rangeGiven option.
      *
-     * @param rangeGiven the rangeGiven option
+     * @param rangeGiven Whether the range is given or should be determined from the {@code input} tensor.
      * @return this Options instance.
      */
     public Options rangeGiven(Boolean rangeGiven) {
@@ -226,7 +241,14 @@ public Options rangeGiven(Boolean rangeGiven) {
     /**
      * Sets the roundMode option.
      *
-     * @param roundMode the roundMode option
+     * @param roundMode The 'round_mode' attribute controls which rounding tie-breaking algorithm is
+     * used when rounding float values to their quantized equivalents. The following
+     * rounding modes are currently supported:
+     * <ul>
+     * <li>HALF_TO_EVEN: this is the default round_mode.</li>
+     * <li>HALF_UP: round towards positive. In this mode 7.5 rounds up to 8 and -7.5
+     * rounds up to -7.</li>
+     * </ul>
      * @return this Options instance.
      */
     public Options roundMode(String roundMode) {
@@ -237,7 +259,9 @@ public Options roundMode(String roundMode) {
     /**
      * Sets the narrowRange option.
      *
-     * @param narrowRange the narrowRange option
+     * @param narrowRange If True, then the absolute value of the quantized minimum value is the same as
+     * the quantized maximum value, instead of 1 greater.
+     * i.e. for 8 bit quantization, the minimum value is -127 instead of -128.
      * @return this Options instance.
      */
     public Options narrowRange(Boolean narrowRange) {
@@ -248,7 +272,8 @@ public Options narrowRange(Boolean narrowRange) {
     /**
      * Sets the axis option.
      *
-     * @param axis the axis option
+     * @param axis If specified, this axis is treated as a channel or slice axis, and a separate
+     * quantization range is used for each channel or slice along this axis.
      * @return this Options instance.
      */
     public Options axis(Long axis) {
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 84274a6e9d4..80210f3fe28 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
@@ -75,12 +75,11 @@ private QuantizeAndDequantizeV4Grad(Operation operation) {
   public static <T extends TNumber> QuantizeAndDequantizeV4Grad<T> create(Scope scope,
       Operand<T> gradients, Operand<T> input, Operand<T> inputMin, Operand<T> inputMax,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeAndDequantizeV4Grad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizeAndDequantizeV4Grad");
     opBuilder.addInput(gradients.asOutput());
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.axis != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java
index 4e98bdcaa26..d5e658a7f77 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java
@@ -93,11 +93,10 @@ private QuantizeDownAndShrinkRange(Operation operation) {
   public static <U extends TNumber> QuantizeDownAndShrinkRange<U> create(Scope scope,
       Operand<? extends TNumber> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax,
       Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeDownAndShrinkRange"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizeDownAndShrinkRange");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new QuantizeDownAndShrinkRange<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedConcat.java
index 0ef565d38db..249fd86aa6f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedConcat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedConcat.java
@@ -77,12 +77,11 @@ private QuantizedConcat(Operation operation) {
   public static <T extends TType> QuantizedConcat<T> create(Scope scope, Operand<TInt32> concatDim,
       Iterable<Operand<T>> values, Iterable<Operand<TFloat32>> inputMins,
       Iterable<Operand<TFloat32>> inputMaxes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConcat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedConcat");
     opBuilder.addInput(concatDim.asOutput());
     opBuilder.addInputList(Operands.asOutputs(values));
     opBuilder.addInputList(Operands.asOutputs(inputMins));
     opBuilder.addInputList(Operands.asOutputs(inputMaxes));
-    opBuilder = scope.apply(opBuilder);
     return new QuantizedConcat<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java
index 233af64fc95..e807fbaa2ab 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java
@@ -73,7 +73,7 @@ public static <W extends TNumber> QuantizedMatMulWithBiasAndDequantize<W> create
       Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB,
       Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput,
       Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBiasAndDequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedMatMulWithBiasAndDequantize");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -83,7 +83,6 @@ public static <W extends TNumber> QuantizedMatMulWithBiasAndDequantize<W> create
     opBuilder.addInput(maxB.asOutput());
     opBuilder.addInput(minFreezedOutput.asOutput());
     opBuilder.addInput(maxFreezedOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java
index b235db81014..b173c0f94fa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java
@@ -79,7 +79,7 @@ public static <W extends TNumber> QuantizedMatMulWithBiasAndRequantize<W> create
       Operand<TFloat32> minA, Operand<TFloat32> maxA, Operand<TFloat32> minB,
       Operand<TFloat32> maxB, Operand<TFloat32> minFreezedOutput,
       Operand<TFloat32> maxFreezedOutput, Class<W> Toutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBiasAndRequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "QuantizedMatMulWithBiasAndRequantize");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
     opBuilder.addInput(bias.asOutput());
@@ -89,7 +89,6 @@ public static <W extends TNumber> QuantizedMatMulWithBiasAndRequantize<W> create
     opBuilder.addInput(maxB.asOutput());
     opBuilder.addInput(minFreezedOutput.asOutput());
     opBuilder.addInput(maxFreezedOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java
index 0a8d62cab19..17dddee3427 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java
@@ -69,11 +69,10 @@ private RequantizationRange(Operation operation) {
   )
   public static RequantizationRange create(Scope scope, Operand<? extends TNumber> input,
       Operand<TFloat32> inputMin, Operand<TFloat32> inputMax) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RequantizationRange"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RequantizationRange");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RequantizationRange(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java
index f7a4cb8fe11..26c3c26e422 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java
@@ -83,13 +83,12 @@ public static <U extends TNumber> Requantize<U> create(Scope scope,
       Operand<? extends TNumber> input, Operand<TFloat32> inputMin, Operand<TFloat32> inputMax,
       Operand<TFloat32> requestedOutputMin, Operand<TFloat32> requestedOutputMax,
       Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Requantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Requantize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(inputMin.asOutput());
     opBuilder.addInput(inputMax.asOutput());
     opBuilder.addInput(requestedOutputMin.asOutput());
     opBuilder.addInput(requestedOutputMax.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new Requantize<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedBincount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedBincount.java
index 3441decff8d..833005da978 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedBincount.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedBincount.java
@@ -77,12 +77,11 @@ private RaggedBincount(Operation operation) {
   public static <U extends TNumber, T extends TNumber> RaggedBincount<U> create(Scope scope,
       Operand<TInt64> splits, Operand<T> values, Operand<T> sizeOutput, Operand<U> weights,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedBincount"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedBincount");
     opBuilder.addInput(splits.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(weights.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.binaryOutput != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java
index 925d4a3a505..9849d5192ff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java
@@ -72,11 +72,10 @@ private RaggedCountSparseOutput(Operation operation) {
   public static <U extends TNumber> RaggedCountSparseOutput<U> create(Scope scope,
       Operand<TInt64> splits, Operand<? extends TNumber> values, Operand<U> weights,
       Boolean binaryOutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedCountSparseOutput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedCountSparseOutput");
     opBuilder.addInput(splits.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(weights.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("binary_output", binaryOutput);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCross.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCross.java
index 976f9aa9c1f..75cde85a9f8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCross.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCross.java
@@ -86,14 +86,13 @@ public static <T extends TType, U extends TNumber> RaggedCross<T, U> create(Scop
       Iterable<Operand<TInt64>> sparseShape, Iterable<Operand<?>> denseInputs, String inputOrder,
       Boolean hashedOutput, Long numBuckets, Long hashKey, Class<T> outValuesType,
       Class<U> outRowSplitsType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedCross"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedCross");
     opBuilder.addInputList(Operands.asOutputs(raggedValues));
     opBuilder.addInputList(Operands.asOutputs(raggedRowSplits));
     opBuilder.addInputList(Operands.asOutputs(sparseIndices));
     opBuilder.addInputList(Operands.asOutputs(sparseValues));
     opBuilder.addInputList(Operands.asOutputs(sparseShape));
     opBuilder.addInputList(Operands.asOutputs(denseInputs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("input_order", inputOrder);
     opBuilder.setAttr("hashed_output", hashedOutput);
     opBuilder.setAttr("num_buckets", numBuckets);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java
index 4744fb613a3..29020d73c27 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java
@@ -99,11 +99,10 @@ private RaggedGather(Operation operation) {
   public static <T extends TNumber, U extends TType> RaggedGather<T, U> create(Scope scope,
       Iterable<Operand<T>> paramsNestedSplits, Operand<U> paramsDenseValues,
       Operand<? extends TNumber> indices, Long OUTPUTRAGGEDRANK) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedGather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedGather");
     opBuilder.addInputList(Operands.asOutputs(paramsNestedSplits));
     opBuilder.addInput(paramsDenseValues.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("OUTPUT_RAGGED_RANK", OUTPUTRAGGEDRANK);
     return new RaggedGather<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedRange.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedRange.java
index 715d8771f7f..ae472c28100 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedRange.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedRange.java
@@ -82,11 +82,10 @@ private RaggedRange(Operation operation) {
   )
   public static <U extends TNumber, T extends TNumber> RaggedRange<U, T> create(Scope scope,
       Operand<T> starts, Operand<T> limits, Operand<T> deltas, Class<U> Tsplits) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedRange"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedRange");
     opBuilder.addInput(starts.asOutput());
     opBuilder.addInput(limits.asOutput());
     opBuilder.addInput(deltas.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tsplits", Operands.toDataType(Tsplits));
     return new RaggedRange<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorFromVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorFromVariant.java
index f293efe3754..22dd0d2803f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorFromVariant.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorFromVariant.java
@@ -90,9 +90,8 @@ private RaggedTensorFromVariant(Operation operation) {
   public static <T extends TNumber, U extends TType> RaggedTensorFromVariant<T, U> create(
       Scope scope, Operand<? extends TType> encodedRagged, Long inputRaggedRank,
       Long outputRaggedRank, Class<U> Tvalues, Class<T> Tsplits) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorFromVariant"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedTensorFromVariant");
     opBuilder.addInput(encodedRagged.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("input_ragged_rank", inputRaggedRank);
     opBuilder.setAttr("output_ragged_rank", outputRaggedRank);
     opBuilder.setAttr("Tvalues", Operands.toDataType(Tvalues));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToSparse.java
index fdf111286a4..36cde5a2809 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToSparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToSparse.java
@@ -71,10 +71,9 @@ private RaggedTensorToSparse(Operation operation) {
   )
   public static <U extends TType> RaggedTensorToSparse<U> create(Scope scope,
       Iterable<Operand<? extends TNumber>> rtNestedSplits, Operand<U> rtDenseValues) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorToSparse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedTensorToSparse");
     opBuilder.addInputList(Operands.asOutputs(rtNestedSplits));
     opBuilder.addInput(rtDenseValues.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RaggedTensorToSparse<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java
index 94970bfcd57..abe485f6628 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java
@@ -108,12 +108,11 @@ private RaggedTensorToTensor(Operation operation) {
   public static <U extends TType> RaggedTensorToTensor<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<U> values, Operand<U> defaultValue,
       Iterable<Operand<? extends TNumber>> rowPartitionTensors, List<String> rowPartitionTypes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorToTensor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedTensorToTensor");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(defaultValue.asOutput());
     opBuilder.addInputList(Operands.asOutputs(rowPartitionTensors));
-    opBuilder = scope.apply(opBuilder);
     String[] rowPartitionTypesArray = new String[rowPartitionTypes.size()];
     for (int i = 0 ; i < rowPartitionTypesArray.length ; i++) {
       rowPartitionTypesArray[i] = rowPartitionTypes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java
index 6324dcf933f..c757c916ad2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java
@@ -72,10 +72,9 @@ private RaggedTensorToVariant(Operation operation) {
   public static RaggedTensorToVariant create(Scope scope,
       Iterable<Operand<? extends TNumber>> rtNestedSplits, Operand<? extends TType> rtDenseValues,
       Boolean batchedInput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorToVariant"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedTensorToVariant");
     opBuilder.addInputList(Operands.asOutputs(rtNestedSplits));
     opBuilder.addInput(rtDenseValues.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("batched_input", batchedInput);
     return new RaggedTensorToVariant(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariantGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariantGradient.java
index f090fb01bdf..6179c50fae2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariantGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariantGradient.java
@@ -70,11 +70,10 @@ private RaggedTensorToVariantGradient(Operation operation) {
   public static <U extends TType> RaggedTensorToVariantGradient<U> create(Scope scope,
       Operand<? extends TType> encodedRaggedGrad, Operand<? extends TNumber> rowSplits,
       Operand<TInt32> denseValuesShape, Class<U> Tvalues) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorToVariantGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RaggedTensorToVariantGradient");
     opBuilder.addInput(encodedRaggedGrad.asOutput());
     opBuilder.addInput(rowSplits.asOutput());
     opBuilder.addInput(denseValuesShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tvalues", Operands.toDataType(Tvalues));
     return new RaggedTensorToVariantGradient<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AllCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AllCandidateSampler.java
index 73197facfd8..2eac70e8b6b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AllCandidateSampler.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AllCandidateSampler.java
@@ -80,9 +80,8 @@ private AllCandidateSampler(Operation operation) {
   )
   public static AllCandidateSampler create(Scope scope, Operand<TInt64> trueClasses, Long numTrue,
       Long numSampled, Boolean unique, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AllCandidateSampler"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AllCandidateSampler");
     opBuilder.addInput(trueClasses.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_true", numTrue);
     opBuilder.setAttr("num_sampled", numSampled);
     opBuilder.setAttr("unique", unique);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousRandomSeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousRandomSeedGenerator.java
index 9ee7de7e0aa..00f7806ee8d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousRandomSeedGenerator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousRandomSeedGenerator.java
@@ -61,10 +61,9 @@ private AnonymousRandomSeedGenerator(Operation operation) {
   )
   public static AnonymousRandomSeedGenerator create(Scope scope, Operand<TInt64> seed,
       Operand<TInt64> seed2) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousRandomSeedGenerator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AnonymousRandomSeedGenerator");
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(seed2.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AnonymousRandomSeedGenerator(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousSeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousSeedGenerator.java
index e4a21446bbc..d9fa99bec9c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousSeedGenerator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousSeedGenerator.java
@@ -63,11 +63,10 @@ private AnonymousSeedGenerator(Operation operation) {
   )
   public static AnonymousSeedGenerator create(Scope scope, Operand<TInt64> seed,
       Operand<TInt64> seed2, Operand<TBool> reshuffle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousSeedGenerator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AnonymousSeedGenerator");
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(seed2.asOutput());
     opBuilder.addInput(reshuffle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AnonymousSeedGenerator(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteRandomSeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteRandomSeedGenerator.java
index 6d777113e8b..934a3184728 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteRandomSeedGenerator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteRandomSeedGenerator.java
@@ -51,10 +51,9 @@ private DeleteRandomSeedGenerator(Operation operation) {
   )
   public static DeleteRandomSeedGenerator create(Scope scope, Operand<? extends TType> handle,
       Operand<? extends TType> deleter) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteRandomSeedGenerator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeleteRandomSeedGenerator");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(deleter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DeleteRandomSeedGenerator(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteSeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteSeedGenerator.java
index 4e32e957220..e3b8b8deb23 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteSeedGenerator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteSeedGenerator.java
@@ -51,10 +51,9 @@ private DeleteSeedGenerator(Operation operation) {
   )
   public static DeleteSeedGenerator create(Scope scope, Operand<? extends TType> handle,
       Operand<? extends TType> deleter) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteSeedGenerator"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeleteSeedGenerator");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(deleter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DeleteSeedGenerator(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DummySeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DummySeedGenerator.java
index 068f85a76df..29de27f6982 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DummySeedGenerator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DummySeedGenerator.java
@@ -54,8 +54,7 @@ private DummySeedGenerator(Operation operation) {
       describeByClass = true
   )
   public static DummySeedGenerator create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DummySeedGenerator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DummySeedGenerator");
     return new DummySeedGenerator(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/LogUniformCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/LogUniformCandidateSampler.java
index 03e07249afb..a07c10ab017 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/LogUniformCandidateSampler.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/LogUniformCandidateSampler.java
@@ -81,9 +81,8 @@ private LogUniformCandidateSampler(Operation operation) {
   )
   public static LogUniformCandidateSampler create(Scope scope, Operand<TInt64> trueClasses,
       Long numTrue, Long numSampled, Boolean unique, Long rangeMax, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogUniformCandidateSampler"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LogUniformCandidateSampler");
     opBuilder.addInput(trueClasses.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_true", numTrue);
     opBuilder.setAttr("num_sampled", numSampled);
     opBuilder.setAttr("unique", unique);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java
index 1e6cd745615..dbcae3bd724 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java
@@ -70,10 +70,9 @@ private Multinomial(Operation operation) {
   public static <U extends TNumber> Multinomial<U> create(Scope scope,
       Operand<? extends TNumber> logits, Operand<TInt32> numSamples, Class<U> outputDtype,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Multinomial"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Multinomial");
     opBuilder.addInput(logits.asOutput());
     opBuilder.addInput(numSamples.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_dtype", Operands.toDataType(outputDtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java
index 3d6636de0fd..85b5e80aab5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java
@@ -62,9 +62,8 @@ private NonDeterministicInts(Operation operation) {
   )
   public static <U extends TType> NonDeterministicInts<U> create(Scope scope,
       Operand<? extends TType> shape, Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonDeterministicInts"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NonDeterministicInts");
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new NonDeterministicInts<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java
index 606d62a32a5..bd1553dfbfa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java
@@ -71,13 +71,12 @@ private ParameterizedTruncatedNormal(Operation operation) {
   public static <U extends TNumber> ParameterizedTruncatedNormal<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<U> means, Operand<U> stdevs, Operand<U> minvals,
       Operand<U> maxvals, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParameterizedTruncatedNormal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ParameterizedTruncatedNormal");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(means.asOutput());
     opBuilder.addInput(stdevs.asOutput());
     opBuilder.addInput(minvals.asOutput());
     opBuilder.addInput(maxvals.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.seed != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java
index 8cb32cd1c30..e16823d482c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java
@@ -69,10 +69,9 @@ private RandomGamma(Operation operation) {
   )
   public static <U extends TNumber> RandomGamma<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<U> alpha, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomGamma"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomGamma");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(alpha.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.seed != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGammaGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGammaGrad.java
index 802b9fdd757..09c333cfa32 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGammaGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGammaGrad.java
@@ -59,10 +59,9 @@ private RandomGammaGrad(Operation operation) {
   )
   public static <T extends TNumber> RandomGammaGrad<T> create(Scope scope, Operand<T> alpha,
       Operand<T> sample) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomGammaGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomGammaGrad");
     opBuilder.addInput(alpha.asOutput());
     opBuilder.addInput(sample.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RandomGammaGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java
index 4922b13255e..e38a0d7cff3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java
@@ -78,10 +78,9 @@ private RandomPoisson(Operation operation) {
   public static <V extends TNumber> RandomPoisson<V> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> rate, Class<V> dtype,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomPoisson"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomPoisson");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(rate.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomShuffle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomShuffle.java
index 32aeeb36e34..1fae5771e0a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomShuffle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomShuffle.java
@@ -71,9 +71,8 @@ private RandomShuffle(Operation operation) {
   )
   public static <T extends TType> RandomShuffle<T> create(Scope scope, Operand<T> value,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomShuffle"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomShuffle");
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.seed != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java
index fae2ff235c4..2d6d6bdd0a7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java
@@ -66,9 +66,8 @@ private RandomStandardNormal(Operation operation) {
   )
   public static <U extends TNumber> RandomStandardNormal<U> create(Scope scope,
       Operand<? extends TNumber> shape, Class<U> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomStandardNormal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomStandardNormal");
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java
index 58e9944512b..87228ae9475 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java
@@ -67,9 +67,8 @@ private RandomUniform(Operation operation) {
   )
   public static <U extends TNumber> RandomUniform<U> create(Scope scope,
       Operand<? extends TNumber> shape, Class<U> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomUniform"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomUniform");
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java
index fa87d13c8ae..9b33f2c9862 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java
@@ -71,11 +71,10 @@ private RandomUniformInt(Operation operation) {
   )
   public static <U extends TNumber> RandomUniformInt<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<U> minval, Operand<U> maxval, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomUniformInt"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RandomUniformInt");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(minval.asOutput());
     opBuilder.addInput(maxval.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.seed != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RecordInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RecordInput.java
index 0ab52ae834c..f9539c97f95 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RecordInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RecordInput.java
@@ -59,8 +59,7 @@ private RecordInput(Operation operation) {
       describeByClass = true
   )
   public static RecordInput create(Scope scope, String filePattern, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RecordInput"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RecordInput");
     opBuilder.setAttr("file_pattern", filePattern);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngReadAndSkip.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngReadAndSkip.java
index 0803ccfc026..00540eed36a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngReadAndSkip.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngReadAndSkip.java
@@ -63,11 +63,10 @@ private RngReadAndSkip(Operation operation) {
   )
   public static RngReadAndSkip create(Scope scope, Operand<? extends TType> resource,
       Operand<TInt32> alg, Operand<? extends TType> delta) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RngReadAndSkip"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RngReadAndSkip");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(alg.asOutput());
     opBuilder.addInput(delta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RngReadAndSkip(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngSkip.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngSkip.java
index 5e027c1ea8f..0e41e2bcfd8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngSkip.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngSkip.java
@@ -57,11 +57,10 @@ private RngSkip(Operation operation) {
   )
   public static RngSkip create(Scope scope, Operand<? extends TType> resource,
       Operand<TInt64> algorithm, Operand<TInt64> delta) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RngSkip"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RngSkip");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
     opBuilder.addInput(delta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RngSkip(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java
index 4bcb8219373..69eddaf8ab8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java
@@ -72,13 +72,12 @@ private StatefulRandomBinomial(Operation operation) {
   public static <V extends TNumber, U extends TNumber> StatefulRandomBinomial<V> create(Scope scope,
       Operand<? extends TType> resource, Operand<TInt64> algorithm,
       Operand<? extends TNumber> shape, Operand<U> counts, Operand<U> probs, Class<V> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulRandomBinomial"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulRandomBinomial");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(counts.asOutput());
     opBuilder.addInput(probs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatefulRandomBinomial<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java
index 8cde26f1306..8655e171171 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java
@@ -70,11 +70,10 @@ private StatefulStandardNormal(Operation operation) {
   public static <U extends TType> StatefulStandardNormal<U> create(Scope scope,
       Operand<? extends TType> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape,
       Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulStandardNormal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulStandardNormal");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatefulStandardNormal<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java
index c97237166a6..4e0742112e2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java
@@ -68,11 +68,10 @@ private StatefulTruncatedNormal(Operation operation) {
   public static <U extends TType> StatefulTruncatedNormal<U> create(Scope scope,
       Operand<? extends TType> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape,
       Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulTruncatedNormal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulTruncatedNormal");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatefulTruncatedNormal<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java
index 54530a52e9f..8b2e28317d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java
@@ -67,11 +67,10 @@ private StatefulUniform(Operation operation) {
   public static <U extends TType> StatefulUniform<U> create(Scope scope,
       Operand<? extends TType> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape,
       Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulUniform"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulUniform");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatefulUniform<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java
index de83124e355..2f858cfd43e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java
@@ -65,11 +65,10 @@ private StatefulUniformFullInt(Operation operation) {
   public static <U extends TType> StatefulUniformFullInt<U> create(Scope scope,
       Operand<? extends TType> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape,
       Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulUniformFullInt"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulUniformFullInt");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatefulUniformFullInt<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java
index d51b3ca0f11..ff5940afe1c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java
@@ -70,13 +70,12 @@ private StatefulUniformInt(Operation operation) {
   public static <U extends TType> StatefulUniformInt<U> create(Scope scope,
       Operand<? extends TType> resource, Operand<TInt64> algorithm, Operand<? extends TType> shape,
       Operand<U> minval, Operand<U> maxval) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulUniformInt"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatefulUniformInt");
     opBuilder.addInput(resource.asOutput());
     opBuilder.addInput(algorithm.asOutput());
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(minval.asOutput());
     opBuilder.addInput(maxval.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatefulUniformInt<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java
index 661327137f5..49bfb4df2e3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java
@@ -70,11 +70,10 @@ private StatelessMultinomial(Operation operation) {
   public static <V extends TNumber> StatelessMultinomial<V> create(Scope scope,
       Operand<? extends TNumber> logits, Operand<TInt32> numSamples,
       Operand<? extends TNumber> seed, Class<V> outputDtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessMultinomial"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessMultinomial");
     opBuilder.addInput(logits.asOutput());
     opBuilder.addInput(numSamples.asOutput());
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_dtype", Operands.toDataType(outputDtype));
     return new StatelessMultinomial<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java
index 65561c38db9..c7c31649a51 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java
@@ -65,14 +65,13 @@ private StatelessParameterizedTruncatedNormal(Operation operation) {
   public static <V extends TNumber> StatelessParameterizedTruncatedNormal<V> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<V> means,
       Operand<V> stddevs, Operand<V> minvals, Operand<V> maxvals) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessParameterizedTruncatedNormal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessParameterizedTruncatedNormal");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(means.asOutput());
     opBuilder.addInput(stddevs.asOutput());
     opBuilder.addInput(minvals.asOutput());
     opBuilder.addInput(maxvals.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatelessParameterizedTruncatedNormal<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java
index 857c1898ee2..f2fe43de2f2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java
@@ -70,12 +70,11 @@ private StatelessRandomBinomial(Operation operation) {
   public static <W extends TNumber, V extends TNumber> StatelessRandomBinomial<W> create(
       Scope scope, Operand<? extends TNumber> shape, Operand<? extends TNumber> seed,
       Operand<V> counts, Operand<V> probs, Class<W> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomBinomial"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomBinomial");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(counts.asOutput());
     opBuilder.addInput(probs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessRandomBinomial<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java
index 6a254a07415..b8301f3e4ad 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java
@@ -63,11 +63,10 @@ private StatelessRandomGamma(Operation operation) {
   )
   public static <V extends TNumber> StatelessRandomGamma<V> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<V> alpha) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomGamma"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomGamma");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(alpha.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatelessRandomGamma<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGetKeyCounterAlg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGetKeyCounterAlg.java
index 28f5edd810d..19876715299 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGetKeyCounterAlg.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGetKeyCounterAlg.java
@@ -65,9 +65,8 @@ private StatelessRandomGetKeyCounterAlg(Operation operation) {
   )
   public static StatelessRandomGetKeyCounterAlg create(Scope scope,
       Operand<? extends TNumber> seed) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomGetKeyCounterAlg"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomGetKeyCounterAlg");
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatelessRandomGetKeyCounterAlg(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java
index abd2b668fd3..433499b7e86 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java
@@ -68,10 +68,9 @@ private StatelessRandomNormal(Operation operation) {
   )
   public static <V extends TNumber> StatelessRandomNormal<V> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomNormal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomNormal");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessRandomNormal<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormalV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormalV2.java
index 853b40eb33c..244ecf26652 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormalV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormalV2.java
@@ -69,12 +69,11 @@ private StatelessRandomNormalV2(Operation operation) {
   public static <U extends TNumber> StatelessRandomNormalV2<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TType> key,
       Operand<? extends TType> counter, Operand<TInt32> alg, Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomNormalV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomNormalV2");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(counter.asOutput());
     opBuilder.addInput(alg.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessRandomNormalV2<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java
index f11d14cd4fb..0d38215c5e4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java
@@ -66,11 +66,10 @@ private StatelessRandomPoisson(Operation operation) {
   public static <W extends TNumber> StatelessRandomPoisson<W> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> seed,
       Operand<? extends TNumber> lam, Class<W> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomPoisson"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomPoisson");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(lam.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessRandomPoisson<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java
index e6f8732083a..a64ec02b6f2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java
@@ -69,10 +69,9 @@ private StatelessRandomUniform(Operation operation) {
   )
   public static <V extends TNumber> StatelessRandomUniform<V> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniform"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomUniform");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessRandomUniform<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java
index 519adfae636..2a9fb099f03 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java
@@ -63,10 +63,9 @@ private StatelessRandomUniformFullInt(Operation operation) {
   )
   public static <V extends TNumber> StatelessRandomUniformFullInt<V> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformFullInt"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomUniformFullInt");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessRandomUniformFullInt<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullIntV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullIntV2.java
index d85c334d713..1375e8b1675 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullIntV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullIntV2.java
@@ -68,12 +68,11 @@ private StatelessRandomUniformFullIntV2(Operation operation) {
   public static <U extends TNumber> StatelessRandomUniformFullIntV2<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TType> key,
       Operand<? extends TType> counter, Operand<TInt32> alg, Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformFullIntV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomUniformFullIntV2");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(counter.asOutput());
     opBuilder.addInput(alg.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessRandomUniformFullIntV2<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java
index b7a31b2f180..6574e658ef3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java
@@ -64,12 +64,11 @@ private StatelessRandomUniformInt(Operation operation) {
   public static <V extends TNumber> StatelessRandomUniformInt<V> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Operand<V> minval,
       Operand<V> maxval) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformInt"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomUniformInt");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
     opBuilder.addInput(minval.asOutput());
     opBuilder.addInput(maxval.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatelessRandomUniformInt<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformIntV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformIntV2.java
index 3b1086869b1..f46ac81e12d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformIntV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformIntV2.java
@@ -68,14 +68,13 @@ private StatelessRandomUniformIntV2(Operation operation) {
   public static <U extends TNumber> StatelessRandomUniformIntV2<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TType> key,
       Operand<? extends TType> counter, Operand<TInt32> alg, Operand<U> minval, Operand<U> maxval) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformIntV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomUniformIntV2");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(counter.asOutput());
     opBuilder.addInput(alg.asOutput());
     opBuilder.addInput(minval.asOutput());
     opBuilder.addInput(maxval.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatelessRandomUniformIntV2<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformV2.java
index 1f6b6339720..e6a8f7b5047 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformV2.java
@@ -70,12 +70,11 @@ private StatelessRandomUniformV2(Operation operation) {
   public static <U extends TNumber> StatelessRandomUniformV2<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TType> key,
       Operand<? extends TType> counter, Operand<TInt32> alg, Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomUniformV2");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(counter.asOutput());
     opBuilder.addInput(alg.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessRandomUniformV2<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java
index 20228830150..5e27e6fad9f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java
@@ -70,10 +70,9 @@ private StatelessTruncatedNormal(Operation operation) {
   )
   public static <V extends TNumber> StatelessTruncatedNormal<V> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TNumber> seed, Class<V> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessTruncatedNormal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessTruncatedNormal");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessTruncatedNormal<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormalV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormalV2.java
index 51de197be08..b66df2e0f67 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormalV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormalV2.java
@@ -71,12 +71,11 @@ private StatelessTruncatedNormalV2(Operation operation) {
   public static <U extends TNumber> StatelessTruncatedNormalV2<U> create(Scope scope,
       Operand<? extends TNumber> shape, Operand<? extends TType> key,
       Operand<? extends TType> counter, Operand<TInt32> alg, Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessTruncatedNormalV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessTruncatedNormalV2");
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(key.asOutput());
     opBuilder.addInput(counter.asOutput());
     opBuilder.addInput(alg.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new StatelessTruncatedNormalV2<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java
index bb61bb3fc28..2413cecd2e0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java
@@ -68,9 +68,8 @@ private TruncatedNormal(Operation operation) {
   )
   public static <U extends TNumber> TruncatedNormal<U> create(Scope scope,
       Operand<? extends TNumber> shape, Class<U> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TruncatedNormal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TruncatedNormal");
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/UniformCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/UniformCandidateSampler.java
index 4b726580c1c..c43eba10640 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/UniformCandidateSampler.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/UniformCandidateSampler.java
@@ -81,9 +81,8 @@ private UniformCandidateSampler(Operation operation) {
   )
   public static UniformCandidateSampler create(Scope scope, Operand<TInt64> trueClasses,
       Long numTrue, Long numSampled, Boolean unique, Long rangeMax, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UniformCandidateSampler"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UniformCandidateSampler");
     opBuilder.addInput(trueClasses.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_true", numTrue);
     opBuilder.setAttr("num_sampled", numSampled);
     opBuilder.setAttr("unique", unique);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastRecvV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastRecvV2.java
index 20337970fdd..9dc30db94d9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastRecvV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastRecvV2.java
@@ -67,12 +67,11 @@ private CollectiveBcastRecvV2(Operation operation) {
   public static <U extends TType> CollectiveBcastRecvV2<U> create(Scope scope,
       Operand<TInt32> groupSize, Operand<TInt32> groupKey, Operand<TInt32> instanceKey,
       Operand<? extends TNumber> shape, Class<U> T, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CollectiveBcastRecvV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CollectiveBcastRecvV2");
     opBuilder.addInput(groupSize.asOutput());
     opBuilder.addInput(groupKey.asOutput());
     opBuilder.addInput(instanceKey.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("T", Operands.toDataType(T));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastSendV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastSendV2.java
index 137f5f2d3ef..3bfa4f56fea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastSendV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastSendV2.java
@@ -64,12 +64,11 @@ private CollectiveBcastSendV2(Operation operation) {
   public static <T extends TType> CollectiveBcastSendV2<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> groupSize, Operand<TInt32> groupKey, Operand<TInt32> instanceKey,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CollectiveBcastSendV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CollectiveBcastSendV2");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(groupSize.asOutput());
     opBuilder.addInput(groupKey.asOutput());
     opBuilder.addInput(instanceKey.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.communicationHint != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/GetOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/GetOptions.java
index dbf716fd32d..17144898ed1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/GetOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/GetOptions.java
@@ -55,9 +55,8 @@ private GetOptions(Operation operation) {
       describeByClass = true
   )
   public static GetOptions create(Scope scope, Operand<? extends TType> inputDataset) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GetOptions"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GetOptions");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new GetOptions(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParameters.java
index a74c575add4..bf8befa00bd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParameters.java
@@ -60,10 +60,9 @@ private LoadTPUEmbeddingFrequencyEstimatorParameters(Operation operation) {
   public static LoadTPUEmbeddingFrequencyEstimatorParameters create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> lastHitStep, Long numShards, Long shardId,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingFrequencyEstimatorParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingFrequencyEstimatorParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(lastHitStep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java
index eca33b34407..4d620783b32 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java
@@ -62,11 +62,10 @@ private LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug(Operation ope
   public static LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> lastHitStep,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(lastHitStep.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParameters.java
index cef412fb0e1..bc7e7cc35a0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParameters.java
@@ -63,8 +63,7 @@ private RetrieveTPUEmbeddingFrequencyEstimatorParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingFrequencyEstimatorParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingFrequencyEstimatorParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingFrequencyEstimatorParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java
index a2911a8b4bd..03cfdd595fc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java
@@ -66,8 +66,7 @@ private RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug(Operation
   )
   public static RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug create(Scope scope,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetAlg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetAlg.java
index 60545e4ee6c..d73bbace62c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetAlg.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetAlg.java
@@ -54,8 +54,7 @@ private StatelessRandomGetAlg(Operation operation) {
       describeByClass = true
   )
   public static StatelessRandomGetAlg create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomGetAlg"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomGetAlg");
     return new StatelessRandomGetAlg(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetKeyCounter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetKeyCounter.java
index cf481a59478..9be0d0463d3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetKeyCounter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetKeyCounter.java
@@ -60,9 +60,8 @@ private StatelessRandomGetKeyCounter(Operation operation) {
       describeByClass = true
   )
   public static StatelessRandomGetKeyCounter create(Scope scope, Operand<? extends TNumber> seed) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomGetKeyCounter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatelessRandomGetKeyCounter");
     opBuilder.addInput(seed.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatelessRandomGetKeyCounter(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAbs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAbs.java
index 29a7dcdd9c8..62a9ded2e42 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAbs.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAbs.java
@@ -57,9 +57,8 @@ private RiscAbs(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscAbs<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscAbs"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscAbs");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscAbs<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAdd.java
index 406b45a4711..9c264ee76c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAdd.java
@@ -61,10 +61,9 @@ private RiscAdd(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscAdd<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscAdd");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscAdd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryArithmetic.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryArithmetic.java
index 62213143018..80c390630cf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryArithmetic.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryArithmetic.java
@@ -60,10 +60,9 @@ private RiscBinaryArithmetic(Operation operation) {
   )
   public static <T extends TNumber> RiscBinaryArithmetic<T> create(Scope scope, Operand<T> x,
       Operand<T> y, String opType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscBinaryArithmetic"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscBinaryArithmetic");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("op_type", opType);
     return new RiscBinaryArithmetic<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryComparison.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryComparison.java
index 4409d5229d2..bfd597f5663 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryComparison.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryComparison.java
@@ -59,10 +59,9 @@ private RiscBinaryComparison(Operation operation) {
   )
   public static <T extends TNumber> RiscBinaryComparison create(Scope scope, Operand<T> x,
       Operand<T> y, String opType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscBinaryComparison"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscBinaryComparison");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("op_type", opType);
     return new RiscBinaryComparison(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBitcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBitcast.java
index ed3ea2df3b6..9eab1ea3e64 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBitcast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBitcast.java
@@ -60,9 +60,8 @@ private RiscBitcast(Operation operation) {
   )
   public static <U extends TType> RiscBitcast<U> create(Scope scope, Operand<? extends TType> x,
       Class<U> DstT) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscBitcast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscBitcast");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("DstT", Operands.toDataType(DstT));
     return new RiscBitcast<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBroadcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBroadcast.java
index 54f7c313839..a61a489b630 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBroadcast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBroadcast.java
@@ -60,10 +60,9 @@ private RiscBroadcast(Operation operation) {
   )
   public static <T extends TType> RiscBroadcast<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscBroadcast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscBroadcast");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscBroadcast<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCast.java
index c998c319f04..43630d9b0fc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCast.java
@@ -60,9 +60,8 @@ private RiscCast(Operation operation) {
   )
   public static <U extends TType> RiscCast<U> create(Scope scope, Operand<? extends TType> x,
       Class<U> DstT) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscCast");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("DstT", Operands.toDataType(DstT));
     return new RiscCast<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCeil.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCeil.java
index b42a4c7fc20..e50de40805e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCeil.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCeil.java
@@ -57,9 +57,8 @@ private RiscCeil(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscCeil<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCeil"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscCeil");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscCeil<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCholesky.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCholesky.java
index 01fd5eda433..e8ff60545ed 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCholesky.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCholesky.java
@@ -57,9 +57,8 @@ private RiscCholesky(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscCholesky<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCholesky"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscCholesky");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscCholesky<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConcat.java
index 60b42cbd7a6..26c4d01d62a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConcat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConcat.java
@@ -61,10 +61,9 @@ private RiscConcat(Operation operation) {
   )
   public static <T extends TType> RiscConcat<T> create(Scope scope, Iterable<Operand<T>> values,
       Operand<? extends TNumber> axis) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscConcat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscConcat");
     opBuilder.addInputList(Operands.asOutputs(values));
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscConcat<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCondition.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCondition.java
index f6c37680a15..cfafe938468 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCondition.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCondition.java
@@ -68,11 +68,10 @@ private RiscCondition(Operation operation) {
   public static <U extends TNumber, T extends TNumber> RiscCondition<U> create(Scope scope,
       Operand<TBool> pred, Operand<T> inputTrue, Operand<T> inputFalse, ConcreteFunction funcTrue,
       ConcreteFunction funcFalse, Class<U> DstT) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCondition"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscCondition");
     opBuilder.addInput(pred.asOutput());
     opBuilder.addInput(inputTrue.asOutput());
     opBuilder.addInput(inputFalse.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("func_true", funcTrue);
     opBuilder.setAttr("func_false", funcFalse);
     opBuilder.setAttr("DstT", Operands.toDataType(DstT));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConv.java
index 327010ddf5c..e5f8100456d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConv.java
@@ -63,10 +63,9 @@ private RiscConv(Operation operation) {
   )
   public static <T extends TNumber> RiscConv<T> create(Scope scope, Operand<T> input,
       Operand<T> filter, List<Long> strides, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscConv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscConv");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(filter.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] stridesArray = new long[strides.size()];
     for (int i = 0 ; i < stridesArray.length ; i++) {
       stridesArray[i] = strides.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCos.java
index 69ce9934490..c82fa527614 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCos.java
@@ -57,9 +57,8 @@ private RiscCos(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscCos<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCos"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscCos");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscCos<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDiv.java
index abaa5fb8866..aa272b56121 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDiv.java
@@ -58,10 +58,9 @@ private RiscDiv(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscDiv<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscDiv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscDiv");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscDiv<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDot.java
index f644c8aaf65..ddae24dbde4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDot.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDot.java
@@ -60,10 +60,9 @@ private RiscDot(Operation operation) {
   )
   public static <T extends TNumber> RiscDot<T> create(Scope scope, Operand<T> a, Operand<T> b,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscDot"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscDot");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.transposeA != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscExp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscExp.java
index 0d1ab7791ea..07e4e22f52d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscExp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscExp.java
@@ -57,9 +57,8 @@ private RiscExp(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscExp<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscExp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscExp");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscExp<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFft.java
index 020983224bf..c835dc4e652 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFft.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFft.java
@@ -57,9 +57,8 @@ private RiscFft(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> RiscFft<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscFft"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscFft");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscFft<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFloor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFloor.java
index 8b0c26e14a3..4f3d19c6ac2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFloor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFloor.java
@@ -57,9 +57,8 @@ private RiscFloor(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscFloor<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscFloor"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscFloor");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscFloor<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscGather.java
index f28efc507df..3db996340a5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscGather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscGather.java
@@ -62,11 +62,10 @@ private RiscGather(Operation operation) {
   )
   public static <T extends TType> RiscGather<T> create(Scope scope, Operand<T> params,
       Operand<? extends TNumber> indices, Operand<? extends TNumber> axis, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscGather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscGather");
     opBuilder.addInput(params.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.batchDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscImag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscImag.java
index a6ba50a85c4..0b48641bf62 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscImag.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscImag.java
@@ -62,9 +62,8 @@ private RiscImag(Operation operation) {
   )
   public static <U extends TNumber> RiscImag<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> Tout) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscImag"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscImag");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     return new RiscImag<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscIsFinite.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscIsFinite.java
index be1c544f909..79371c4fa1e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscIsFinite.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscIsFinite.java
@@ -55,9 +55,8 @@ private RiscIsFinite(Operation operation) {
       describeByClass = true
   )
   public static RiscIsFinite create(Scope scope, Operand<? extends TNumber> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscIsFinite"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscIsFinite");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscIsFinite(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLog.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLog.java
index c089cf21012..e04167ef115 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLog.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLog.java
@@ -57,9 +57,8 @@ private RiscLog(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscLog<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscLog"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscLog");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscLog<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalAnd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalAnd.java
index ee63434558c..72bbd770a90 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalAnd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalAnd.java
@@ -55,10 +55,9 @@ private RiscLogicalAnd(Operation operation) {
       describeByClass = true
   )
   public static RiscLogicalAnd create(Scope scope, Operand<TBool> x, Operand<TBool> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscLogicalAnd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscLogicalAnd");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscLogicalAnd(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalNot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalNot.java
index 478c6cf0ca7..74c9a634ea8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalNot.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalNot.java
@@ -54,9 +54,8 @@ private RiscLogicalNot(Operation operation) {
       describeByClass = true
   )
   public static RiscLogicalNot create(Scope scope, Operand<TBool> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscLogicalNot"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscLogicalNot");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscLogicalNot(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalOr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalOr.java
index 0b59472b63c..d22cbd7de03 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalOr.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalOr.java
@@ -55,10 +55,9 @@ private RiscLogicalOr(Operation operation) {
       describeByClass = true
   )
   public static RiscLogicalOr create(Scope scope, Operand<TBool> x, Operand<TBool> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscLogicalOr"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscLogicalOr");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscLogicalOr(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMax.java
index 7c04002ff3c..e415799e553 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMax.java
@@ -60,10 +60,9 @@ private RiscMax(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscMax<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscMax");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscMax<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMin.java
index a2ad19c04bc..2063b4a32fb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMin.java
@@ -58,10 +58,9 @@ private RiscMin(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscMin<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscMin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscMin");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscMin<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMul.java
index d72af9fceec..6bc95f2f430 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMul.java
@@ -58,10 +58,9 @@ private RiscMul(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscMul<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscMul");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscMul<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscNeg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscNeg.java
index 4fd5d508102..0ac4df637da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscNeg.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscNeg.java
@@ -57,9 +57,8 @@ private RiscNeg(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscNeg<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscNeg"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscNeg");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscNeg<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPad.java
index ddf537f8788..d237088a626 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPad.java
@@ -60,11 +60,10 @@ private RiscPad(Operation operation) {
   )
   public static <T extends TNumber> RiscPad<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> paddings, Operand<T> constantValues) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscPad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscPad");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddings.asOutput());
     opBuilder.addInput(constantValues.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscPad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPool.java
index 2f9a14c0ed2..66fd3cbe326 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPool.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPool.java
@@ -63,9 +63,8 @@ private RiscPool(Operation operation) {
   )
   public static <T extends TNumber> RiscPool<T> create(Scope scope, Operand<T> value,
       List<Long> ksize, List<Long> strides, String poolingType, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscPool"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscPool");
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] ksizeArray = new long[ksize.size()];
     for (int i = 0 ; i < ksizeArray.length ; i++) {
       ksizeArray[i] = ksize.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPow.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPow.java
index 7b7a991c662..57261654a6d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPow.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPow.java
@@ -58,10 +58,9 @@ private RiscPow(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscPow<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscPow"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscPow");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscPow<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRandomUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRandomUniform.java
index 4dfdc4d9f8e..194bbf3a944 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRandomUniform.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRandomUniform.java
@@ -57,9 +57,8 @@ private RiscRandomUniform(Operation operation) {
   )
   public static RiscRandomUniform create(Scope scope, Operand<? extends TNumber> shape,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscRandomUniform"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscRandomUniform");
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.seed != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReal.java
index 0e15a35ff5d..2751bd35a2e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReal.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReal.java
@@ -62,9 +62,8 @@ private RiscReal(Operation operation) {
   )
   public static <U extends TNumber> RiscReal<U> create(Scope scope, Operand<? extends TType> input,
       Class<U> Tout) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscReal"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscReal");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     return new RiscReal<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReduce.java
index 813bd04c4bb..6fdba24a2a3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReduce.java
@@ -60,10 +60,9 @@ private RiscReduce(Operation operation) {
   )
   public static <T extends TNumber> RiscReduce<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> axis, String reduceType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscReduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscReduce");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("reduce_type", reduceType);
     return new RiscReduce<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRem.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRem.java
index 8efdc93dd16..a5afe0bc654 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRem.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRem.java
@@ -58,10 +58,9 @@ private RiscRem(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscRem<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscRem"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscRem");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscRem<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReshape.java
index e102911a274..e38b38da3b8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReshape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReshape.java
@@ -59,10 +59,9 @@ private RiscReshape(Operation operation) {
   )
   public static <T extends TNumber> RiscReshape<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscReshape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscReshape");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscReshape<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReverse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReverse.java
index 1717c78dea0..01bc414dcea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReverse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReverse.java
@@ -59,10 +59,9 @@ private RiscReverse(Operation operation) {
   )
   public static <T extends TNumber> RiscReverse<T> create(Scope scope, Operand<T> tensor,
       Operand<? extends TNumber> axis) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscReverse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscReverse");
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscReverse<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscScatter.java
index caa17adc322..7cff6bf97d7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscScatter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscScatter.java
@@ -61,11 +61,10 @@ private RiscScatter(Operation operation) {
   )
   public static <U extends TNumber, T extends TNumber> RiscScatter<U> create(Scope scope,
       Operand<T> indices, Operand<U> updates, Operand<T> shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscScatter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscScatter");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(updates.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscScatter<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscShape.java
index 6e9fb8238eb..e62af54f8ab 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscShape.java
@@ -61,9 +61,8 @@ private RiscShape(Operation operation) {
   )
   public static <U extends TNumber> RiscShape<U> create(Scope scope,
       Operand<? extends TNumber> input, Class<U> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscShape");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new RiscShape<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSign.java
index 4cd3a6031b9..adc02df655b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSign.java
@@ -57,9 +57,8 @@ private RiscSign(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscSign<T> create(Scope scope, Operand<T> x) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscSign");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscSign<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSlice.java
index 7d6fdea814c..021766472b9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSlice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSlice.java
@@ -61,11 +61,10 @@ private RiscSlice(Operation operation) {
   )
   public static <T extends TNumber, U extends TNumber> RiscSlice<T> create(Scope scope,
       Operand<T> input, Operand<U> begin, Operand<U> sizeOutput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSlice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscSlice");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(begin.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscSlice<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSort.java
index 3739958cf2c..8740f1e2b38 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSort.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSort.java
@@ -60,10 +60,9 @@ private RiscSort(Operation operation) {
   )
   public static <T extends TNumber> RiscSort<T> create(Scope scope, Operand<T> input,
       Operand<? extends TNumber> axis, String direction) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSort"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscSort");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(axis.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("direction", direction);
     return new RiscSort<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSqueeze.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSqueeze.java
index 4f40fdb43e1..0f4aa6bb852 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSqueeze.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSqueeze.java
@@ -61,9 +61,8 @@ private RiscSqueeze(Operation operation) {
   )
   public static <T extends TType> RiscSqueeze<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSqueeze"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscSqueeze");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.squeezeDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSub.java
index d83078cf01d..d52f056319e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSub.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSub.java
@@ -58,10 +58,9 @@ private RiscSub(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscSub<T> create(Scope scope, Operand<T> x, Operand<T> y) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSub"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscSub");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscSub<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTranspose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTranspose.java
index a993d61e780..3d84b52f2c8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTranspose.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTranspose.java
@@ -60,10 +60,9 @@ private RiscTranspose(Operation operation) {
   )
   public static <T extends TType> RiscTranspose<T> create(Scope scope, Operand<T> x,
       Operand<? extends TNumber> perm) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscTranspose"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscTranspose");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(perm.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RiscTranspose<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTriangularSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTriangularSolve.java
index 839392b2112..d7e8df3c8c1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTriangularSolve.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTriangularSolve.java
@@ -60,10 +60,9 @@ private RiscTriangularSolve(Operation operation) {
   )
   public static <T extends TNumber> RiscTriangularSolve<T> create(Scope scope, Operand<T> matrix,
       Operand<T> rhs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscTriangularSolve"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscTriangularSolve");
     opBuilder.addInput(matrix.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.lower != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscUnary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscUnary.java
index 2931d94605a..0af89d9cfa0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscUnary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscUnary.java
@@ -58,9 +58,8 @@ private RiscUnary(Operation operation) {
       describeByClass = true
   )
   public static <T extends TNumber> RiscUnary<T> create(Scope scope, Operand<T> x, String opType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscUnary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscUnary");
     opBuilder.addInput(x.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("op_type", opType);
     return new RiscUnary<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscWhile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscWhile.java
index 328f098c70d..ba34e5122b5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscWhile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscWhile.java
@@ -67,9 +67,8 @@ private RiscWhile(Operation operation) {
   )
   public static RiscWhile create(Scope scope, Iterable<Operand<?>> input, ConcreteFunction cond,
       ConcreteFunction body, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscWhile"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RiscWhile");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("cond", cond);
     opBuilder.setAttr("body", body);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft.java
index 15b4c6d4c15..742b9fe08c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft.java
@@ -59,9 +59,8 @@ private BatchFft(Operation operation) {
       describeByClass = true
   )
   public static BatchFft create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchFft"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchFft");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchFft(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft2d.java
index 86eeb226d49..6767347af52 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft2d.java
@@ -59,9 +59,8 @@ private BatchFft2d(Operation operation) {
       describeByClass = true
   )
   public static BatchFft2d create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchFft2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchFft2d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchFft2d(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft3d.java
index 3282b91163e..91e241a7754 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft3d.java
@@ -59,9 +59,8 @@ private BatchFft3d(Operation operation) {
       describeByClass = true
   )
   public static BatchFft3d create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchFft3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchFft3d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchFft3d(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft.java
index b14da1814ce..f9268e359ae 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft.java
@@ -59,9 +59,8 @@ private BatchIfft(Operation operation) {
       describeByClass = true
   )
   public static BatchIfft create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchIfft"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchIfft");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchIfft(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft2d.java
index 5b660ab4717..163b0271985 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft2d.java
@@ -59,9 +59,8 @@ private BatchIfft2d(Operation operation) {
       describeByClass = true
   )
   public static BatchIfft2d create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchIfft2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchIfft2d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchIfft2d(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft3d.java
index de17e51457d..32011d3e585 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft3d.java
@@ -59,9 +59,8 @@ private BatchIfft3d(Operation operation) {
       describeByClass = true
   )
   public static BatchIfft3d create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchIfft3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchIfft3d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BatchIfft3d(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft.java
index 70a615edc54..f4a1f5c64d8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft.java
@@ -63,9 +63,8 @@ private Fft(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Fft<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fft"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Fft");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Fft<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft2d.java
index 2a9e532fed5..63778ffca11 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft2d.java
@@ -63,9 +63,8 @@ private Fft2d(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Fft2d<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fft2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Fft2d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Fft2d<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft3d.java
index 6dffbd658d1..41ce94f46c3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft3d.java
@@ -63,9 +63,8 @@ private Fft3d(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Fft3d<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fft3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Fft3d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Fft3d<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft.java
index fe2a1572a49..2a4b7b56db8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft.java
@@ -63,9 +63,8 @@ private Ifft(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Ifft<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ifft"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Ifft");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Ifft<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft2d.java
index 34a73ec59f8..6dbd0bc7d93 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft2d.java
@@ -63,9 +63,8 @@ private Ifft2d(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Ifft2d<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ifft2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Ifft2d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Ifft2d<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft3d.java
index b126e65bb71..4b427df602d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft3d.java
@@ -63,9 +63,8 @@ private Ifft3d(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Ifft3d<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ifft3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Ifft3d");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Ifft3d<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java
index 1246e75df6f..2501fca9f4f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java
@@ -79,10 +79,9 @@ private Irfft(Operation operation) {
   )
   public static <U extends TNumber> Irfft<U> create(Scope scope, Operand<? extends TType> input,
       Operand<TInt32> fftLength, Class<U> Treal) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Irfft"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Irfft");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Treal", Operands.toDataType(Treal));
     return new Irfft<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java
index bd7239a5398..3ec6240540a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java
@@ -80,10 +80,9 @@ private Irfft2d(Operation operation) {
   )
   public static <U extends TNumber> Irfft2d<U> create(Scope scope, Operand<? extends TType> input,
       Operand<TInt32> fftLength, Class<U> Treal) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Irfft2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Irfft2d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Treal", Operands.toDataType(Treal));
     return new Irfft2d<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java
index 9dde73296c4..8fb04f1d567 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java
@@ -80,10 +80,9 @@ private Irfft3d(Operation operation) {
   )
   public static <U extends TNumber> Irfft3d<U> create(Scope scope, Operand<? extends TType> input,
       Operand<TInt32> fftLength, Class<U> Treal) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Irfft3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Irfft3d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Treal", Operands.toDataType(Treal));
     return new Irfft3d<>(opBuilder.build());
   }
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 08284d88051..7fcf1e8931c 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
@@ -75,10 +75,9 @@ private Rfft(Operation operation) {
   )
   public static <U extends TType> Rfft<U> create(Scope scope, Operand<? extends TNumber> input,
       Operand<TInt32> fftLength, Class<U> Tcomplex) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rfft"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Rfft");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tcomplex", Operands.toDataType(Tcomplex));
     return new Rfft<>(opBuilder.build());
   }
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 e48596b4329..786c0be03b0 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
@@ -76,10 +76,9 @@ private Rfft2d(Operation operation) {
   )
   public static <U extends TType> Rfft2d<U> create(Scope scope, Operand<? extends TNumber> input,
       Operand<TInt32> fftLength, Class<U> Tcomplex) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rfft2d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Rfft2d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tcomplex", Operands.toDataType(Tcomplex));
     return new Rfft2d<>(opBuilder.build());
   }
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 028fdf53c7b..180d73ea184 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
@@ -76,10 +76,9 @@ private Rfft3d(Operation operation) {
   )
   public static <U extends TType> Rfft3d<U> create(Scope scope, Operand<? extends TNumber> input,
       Operand<TInt32> fftLength, Class<U> Tcomplex) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rfft3d"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Rfft3d");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(fftLength.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tcomplex", Operands.toDataType(Tcomplex));
     return new Rfft3d<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java
index 3763cc869ad..06ae4329408 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java
@@ -83,11 +83,10 @@ private AddManySparseToTensorsMap(Operation operation) {
   )
   public static AddManySparseToTensorsMap create(Scope scope, Operand<TInt64> sparseIndices,
       Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AddManySparseToTensorsMap"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AddManySparseToTensorsMap");
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
     opBuilder.addInput(sparseShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java
index 3a3e7a36687..32450a5d1d3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java
@@ -75,11 +75,10 @@ private AddSparseToTensorsMap(Operation operation) {
   )
   public static AddSparseToTensorsMap create(Scope scope, Operand<TInt64> sparseIndices,
       Operand<? extends TType> sparseValues, Operand<TInt64> sparseShape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AddSparseToTensorsMap"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AddSparseToTensorsMap");
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
     opBuilder.addInput(sparseShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.container != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java
index 50c007410a6..20cc808c8a1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java
@@ -71,10 +71,9 @@ private DenseCountSparseOutput(Operation operation) {
   public static <U extends TNumber> DenseCountSparseOutput<U> create(Scope scope,
       Operand<? extends TNumber> values, Operand<U> weights, Boolean binaryOutput,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseCountSparseOutput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DenseCountSparseOutput");
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(weights.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("binary_output", binaryOutput);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToDenseSetOperation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToDenseSetOperation.java
index 3bdf87ac4cb..7ef4cdef3ba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToDenseSetOperation.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToDenseSetOperation.java
@@ -80,10 +80,9 @@ private DenseToDenseSetOperation(Operation operation) {
   )
   public static <T extends TType> DenseToDenseSetOperation<T> create(Scope scope, Operand<T> set1,
       Operand<T> set2, String setOperation, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToDenseSetOperation"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DenseToDenseSetOperation");
     opBuilder.addInput(set1.asOutput());
     opBuilder.addInput(set2.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("set_operation", setOperation);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToSparseSetOperation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToSparseSetOperation.java
index e00e1ca536a..6afc0248772 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToSparseSetOperation.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToSparseSetOperation.java
@@ -92,12 +92,11 @@ private DenseToSparseSetOperation(Operation operation) {
   public static <T extends TType> DenseToSparseSetOperation<T> create(Scope scope, Operand<T> set1,
       Operand<TInt64> set2Indices, Operand<T> set2Values, Operand<TInt64> set2Shape,
       String setOperation, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToSparseSetOperation"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DenseToSparseSetOperation");
     opBuilder.addInput(set1.asOutput());
     opBuilder.addInput(set2Indices.asOutput());
     opBuilder.addInput(set2Values.asOutput());
     opBuilder.addInput(set2Shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("set_operation", setOperation);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java
index fb60e31778d..a57326729d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java
@@ -111,9 +111,8 @@ private DeserializeSparse(Operation operation) {
   )
   public static <U extends TType> DeserializeSparse<U> create(Scope scope,
       Operand<? extends TType> serializedSparse, Class<U> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeserializeSparse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DeserializeSparse");
     opBuilder.addInput(serializedSparse.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new DeserializeSparse<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java
index d224c39509f..98d092850d7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java
@@ -69,13 +69,12 @@ public static SparseAccumulatorApplyGradient create(Scope scope, Operand<TString
       Operand<TInt64> localStep, Operand<TInt64> gradientIndices,
       Operand<? extends TType> gradientValues, Operand<TInt64> gradientShape,
       Boolean hasKnownShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseAccumulatorApplyGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseAccumulatorApplyGradient");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(localStep.asOutput());
     opBuilder.addInput(gradientIndices.asOutput());
     opBuilder.addInput(gradientValues.asOutput());
     opBuilder.addInput(gradientShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("has_known_shape", hasKnownShape);
     return new SparseAccumulatorApplyGradient(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorTakeGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorTakeGradient.java
index 896d1ebd74a..1e82f4bef9a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorTakeGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorTakeGradient.java
@@ -81,10 +81,9 @@ private SparseAccumulatorTakeGradient(Operation operation) {
   )
   public static <T extends TType> SparseAccumulatorTakeGradient<T> create(Scope scope,
       Operand<TString> handle, Operand<TInt32> numRequired, Class<T> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseAccumulatorTakeGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseAccumulatorTakeGradient");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(numRequired.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new SparseAccumulatorTakeGradient<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java
index fca9b69819f..792e1101808 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java
@@ -89,7 +89,7 @@ private SparseAdd(Operation operation) {
   public static <T extends TType> SparseAdd<T> create(Scope scope, Operand<TInt64> aIndices,
       Operand<T> aValues, Operand<TInt64> aShape, Operand<TInt64> bIndices, Operand<T> bValues,
       Operand<TInt64> bShape, Operand<? extends TNumber> thresh) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseAdd");
     opBuilder.addInput(aIndices.asOutput());
     opBuilder.addInput(aValues.asOutput());
     opBuilder.addInput(aShape.asOutput());
@@ -97,7 +97,6 @@ public static <T extends TType> SparseAdd<T> create(Scope scope, Operand<TInt64>
     opBuilder.addInput(bValues.asOutput());
     opBuilder.addInput(bShape.asOutput());
     opBuilder.addInput(thresh.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseAdd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAddGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAddGrad.java
index 248cecd3126..e88a90c5e92 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAddGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAddGrad.java
@@ -75,12 +75,11 @@ private SparseAddGrad(Operation operation) {
   )
   public static <T extends TType> SparseAddGrad<T> create(Scope scope, Operand<T> backpropValGrad,
       Operand<TInt64> aIndices, Operand<TInt64> bIndices, Operand<TInt64> sumIndices) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseAddGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseAddGrad");
     opBuilder.addInput(backpropValGrad.asOutput());
     opBuilder.addInput(aIndices.asOutput());
     opBuilder.addInput(bIndices.asOutput());
     opBuilder.addInput(sumIndices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseAddGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseBincount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseBincount.java
index c30dacda188..b13f2f043d3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseBincount.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseBincount.java
@@ -78,13 +78,12 @@ private SparseBincount(Operation operation) {
   public static <U extends TNumber, T extends TNumber> SparseBincount<U> create(Scope scope,
       Operand<TInt64> indices, Operand<T> values, Operand<TInt64> denseShape, Operand<T> sizeOutput,
       Operand<U> weights, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseBincount"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseBincount");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(denseShape.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
     opBuilder.addInput(weights.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.binaryOutput != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConcat.java
index 152e475368f..4b4f2aad88e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConcat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConcat.java
@@ -112,11 +112,10 @@ private SparseConcat(Operation operation) {
   public static <T extends TType> SparseConcat<T> create(Scope scope,
       Iterable<Operand<TInt64>> indices, Iterable<Operand<T>> values,
       Iterable<Operand<TInt64>> shapes, Long concatDim) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseConcat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseConcat");
     opBuilder.addInputList(Operands.asOutputs(indices));
     opBuilder.addInputList(Operands.asOutputs(values));
     opBuilder.addInputList(Operands.asOutputs(shapes));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("concat_dim", concatDim);
     return new SparseConcat<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConditionalAccumulator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConditionalAccumulator.java
index 2d2b5509fbc..42b9e9795e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConditionalAccumulator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConditionalAccumulator.java
@@ -71,8 +71,7 @@ private SparseConditionalAccumulator(Operation operation) {
   )
   public static <T extends TType> SparseConditionalAccumulator create(Scope scope, Class<T> dtype,
       Shape shape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseConditionalAccumulator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseConditionalAccumulator");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("shape", shape);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java
index 509f91943cf..f5a952335fa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java
@@ -73,12 +73,11 @@ private SparseCountSparseOutput(Operation operation) {
   public static <U extends TNumber> SparseCountSparseOutput<U> create(Scope scope,
       Operand<TInt64> indices, Operand<? extends TNumber> values, Operand<TInt64> denseShape,
       Operand<U> weights, Boolean binaryOutput, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseCountSparseOutput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseCountSparseOutput");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(denseShape.asOutput());
     opBuilder.addInput(weights.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("binary_output", binaryOutput);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCross.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCross.java
index 8e48ce89324..30fc19a5315 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCross.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCross.java
@@ -108,13 +108,12 @@ private SparseCross(Operation operation) {
   public static SparseCross create(Scope scope, Iterable<Operand<TInt64>> indices,
       Iterable<Operand<?>> values, Iterable<Operand<TInt64>> shapes,
       Iterable<Operand<?>> denseInputs, Operand<TString> sep) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseCross"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseCross");
     opBuilder.addInputList(Operands.asOutputs(indices));
     opBuilder.addInputList(Operands.asOutputs(values));
     opBuilder.addInputList(Operands.asOutputs(shapes));
     opBuilder.addInputList(Operands.asOutputs(denseInputs));
     opBuilder.addInput(sep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseCross(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCrossHashed.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCrossHashed.java
index 39373955fde..93e93fe4531 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCrossHashed.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCrossHashed.java
@@ -112,7 +112,7 @@ public static SparseCrossHashed create(Scope scope, Iterable<Operand<TInt64>> in
       Iterable<Operand<?>> values, Iterable<Operand<TInt64>> shapes,
       Iterable<Operand<?>> denseInputs, Operand<TInt64> numBuckets, Operand<TBool> strongHash,
       Operand<TInt64> salt) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseCrossHashed"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseCrossHashed");
     opBuilder.addInputList(Operands.asOutputs(indices));
     opBuilder.addInputList(Operands.asOutputs(values));
     opBuilder.addInputList(Operands.asOutputs(shapes));
@@ -120,7 +120,6 @@ public static SparseCrossHashed create(Scope scope, Iterable<Operand<TInt64>> in
     opBuilder.addInput(numBuckets.asOutput());
     opBuilder.addInput(strongHash.asOutput());
     opBuilder.addInput(salt.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseCrossHashed(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseAdd.java
index 5b90d60145f..96911d81a5d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseAdd.java
@@ -74,12 +74,11 @@ private SparseDenseCwiseAdd(Operation operation) {
   )
   public static <T extends TType> SparseDenseCwiseAdd<T> create(Scope scope,
       Operand<TInt64> spIndices, Operand<T> spValues, Operand<TInt64> spShape, Operand<T> dense) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseDenseCwiseAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseDenseCwiseAdd");
     opBuilder.addInput(spIndices.asOutput());
     opBuilder.addInput(spValues.asOutput());
     opBuilder.addInput(spShape.asOutput());
     opBuilder.addInput(dense.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseDenseCwiseAdd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseDiv.java
index 26276a5729f..dabb95c94f4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseDiv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseDiv.java
@@ -69,12 +69,11 @@ private SparseDenseCwiseDiv(Operation operation) {
   )
   public static <T extends TType> SparseDenseCwiseDiv<T> create(Scope scope,
       Operand<TInt64> spIndices, Operand<T> spValues, Operand<TInt64> spShape, Operand<T> dense) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseDenseCwiseDiv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseDenseCwiseDiv");
     opBuilder.addInput(spIndices.asOutput());
     opBuilder.addInput(spValues.asOutput());
     opBuilder.addInput(spShape.asOutput());
     opBuilder.addInput(dense.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseDenseCwiseDiv<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseMul.java
index bdd20f9da24..046426ce0c4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseMul.java
@@ -72,12 +72,11 @@ private SparseDenseCwiseMul(Operation operation) {
   )
   public static <T extends TType> SparseDenseCwiseMul<T> create(Scope scope,
       Operand<TInt64> spIndices, Operand<T> spValues, Operand<TInt64> spShape, Operand<T> dense) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseDenseCwiseMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseDenseCwiseMul");
     opBuilder.addInput(spIndices.asOutput());
     opBuilder.addInput(spValues.asOutput());
     opBuilder.addInput(spShape.asOutput());
     opBuilder.addInput(dense.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseDenseCwiseMul<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRows.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRows.java
index e63b03b97ea..1f22702059e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRows.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRows.java
@@ -113,12 +113,11 @@ private SparseFillEmptyRows(Operation operation) {
   public static <T extends TType> SparseFillEmptyRows<T> create(Scope scope,
       Operand<TInt64> indices, Operand<T> values, Operand<TInt64> denseShape,
       Operand<T> defaultValue) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseFillEmptyRows"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseFillEmptyRows");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(denseShape.asOutput());
     opBuilder.addInput(defaultValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseFillEmptyRows<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRowsGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRowsGrad.java
index 3733bf3eeab..bd262ebb278 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRowsGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRowsGrad.java
@@ -74,10 +74,9 @@ private SparseFillEmptyRowsGrad(Operation operation) {
   )
   public static <T extends TType> SparseFillEmptyRowsGrad<T> create(Scope scope,
       Operand<TInt64> reverseIndexMap, Operand<T> gradValues) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseFillEmptyRowsGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseFillEmptyRowsGrad");
     opBuilder.addInput(reverseIndexMap.asOutput());
     opBuilder.addInput(gradValues.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseFillEmptyRowsGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java
index a7b3ea3aa7f..b913561a039 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java
@@ -70,10 +70,9 @@ private SparseMatMul(Operation operation) {
   )
   public static SparseMatMul create(Scope scope, Operand<? extends TNumber> a,
       Operand<? extends TNumber> b, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseMatMul");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.transposeA != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMax.java
index e76ad7af8e2..534e256d548 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMax.java
@@ -80,12 +80,11 @@ private SparseReduceMax(Operation operation) {
   public static <T extends TNumber> SparseReduceMax<T> create(Scope scope,
       Operand<TInt64> inputIndices, Operand<T> inputValues, Operand<TInt64> inputShape,
       Operand<TInt32> reductionAxes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReduceMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseReduceMax");
     opBuilder.addInput(inputIndices.asOutput());
     opBuilder.addInput(inputValues.asOutput());
     opBuilder.addInput(inputShape.asOutput());
     opBuilder.addInput(reductionAxes.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMaxSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMaxSparse.java
index 85626a38039..075937687d8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMaxSparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMaxSparse.java
@@ -86,12 +86,11 @@ private SparseReduceMaxSparse(Operation operation) {
   public static <T extends TNumber> SparseReduceMaxSparse<T> create(Scope scope,
       Operand<TInt64> inputIndices, Operand<T> inputValues, Operand<TInt64> inputShape,
       Operand<TInt32> reductionAxes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReduceMaxSparse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseReduceMaxSparse");
     opBuilder.addInput(inputIndices.asOutput());
     opBuilder.addInput(inputValues.asOutput());
     opBuilder.addInput(inputShape.asOutput());
     opBuilder.addInput(reductionAxes.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSum.java
index a047dc998ad..b3e4e20e8c0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSum.java
@@ -80,12 +80,11 @@ private SparseReduceSum(Operation operation) {
   public static <T extends TType> SparseReduceSum<T> create(Scope scope,
       Operand<TInt64> inputIndices, Operand<T> inputValues, Operand<TInt64> inputShape,
       Operand<TInt32> reductionAxes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReduceSum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseReduceSum");
     opBuilder.addInput(inputIndices.asOutput());
     opBuilder.addInput(inputValues.asOutput());
     opBuilder.addInput(inputShape.asOutput());
     opBuilder.addInput(reductionAxes.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSumSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSumSparse.java
index ebc2f1889fc..20e3887bffa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSumSparse.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSumSparse.java
@@ -86,12 +86,11 @@ private SparseReduceSumSparse(Operation operation) {
   public static <T extends TType> SparseReduceSumSparse<T> create(Scope scope,
       Operand<TInt64> inputIndices, Operand<T> inputValues, Operand<TInt64> inputShape,
       Operand<TInt32> reductionAxes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReduceSumSparse"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseReduceSumSparse");
     opBuilder.addInput(inputIndices.asOutput());
     opBuilder.addInput(inputValues.asOutput());
     opBuilder.addInput(inputShape.asOutput());
     opBuilder.addInput(reductionAxes.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReorder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReorder.java
index dba473df550..b1b836e6563 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReorder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReorder.java
@@ -75,11 +75,10 @@ private SparseReorder(Operation operation) {
   )
   public static <T extends TType> SparseReorder<T> create(Scope scope, Operand<TInt64> inputIndices,
       Operand<T> inputValues, Operand<TInt64> inputShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReorder"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseReorder");
     opBuilder.addInput(inputIndices.asOutput());
     opBuilder.addInput(inputValues.asOutput());
     opBuilder.addInput(inputShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseReorder<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReshape.java
index 1ac246fd9e0..59eedfde460 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReshape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReshape.java
@@ -77,11 +77,10 @@ private SparseReshape(Operation operation) {
   )
   public static SparseReshape create(Scope scope, Operand<TInt64> inputIndices,
       Operand<TInt64> inputShape, Operand<TInt64> newShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReshape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseReshape");
     opBuilder.addInput(inputIndices.asOutput());
     opBuilder.addInput(inputShape.asOutput());
     opBuilder.addInput(newShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseReshape(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java
index 85b840b16e9..cfa2fadbd74 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java
@@ -67,11 +67,10 @@ private SparseSegmentMean(Operation operation) {
   )
   public static <T extends TNumber> SparseSegmentMean<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentMean"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentMean");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSegmentMean<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java
index d071f487d35..25245eb2db0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java
@@ -69,12 +69,11 @@ private SparseSegmentMeanGrad(Operation operation) {
   public static <T extends TNumber> SparseSegmentMeanGrad<T> create(Scope scope, Operand<T> grad,
       Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
       Operand<TInt32> outputDim0) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentMeanGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentMeanGrad");
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(outputDim0.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSegmentMeanGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java
index 154c324b5bc..ddc60bd6065 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java
@@ -71,12 +71,11 @@ private SparseSegmentMeanWithNumSegments(Operation operation) {
   public static <T extends TNumber> SparseSegmentMeanWithNumSegments<T> create(Scope scope,
       Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
       Operand<? extends TNumber> numSegments) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentMeanWithNumSegments"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentMeanWithNumSegments");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(numSegments.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSegmentMeanWithNumSegments<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java
index 0e984d8faa7..7834485434d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java
@@ -66,11 +66,10 @@ private SparseSegmentSqrtN(Operation operation) {
   )
   public static <T extends TNumber> SparseSegmentSqrtN<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSqrtN"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentSqrtN");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSegmentSqrtN<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java
index db99f27f376..b6e5b54277a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java
@@ -69,12 +69,11 @@ private SparseSegmentSqrtNGrad(Operation operation) {
   public static <T extends TNumber> SparseSegmentSqrtNGrad<T> create(Scope scope, Operand<T> grad,
       Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
       Operand<TInt32> outputDim0) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSqrtNGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentSqrtNGrad");
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(outputDim0.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSegmentSqrtNGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java
index 2f936493b98..6bd3339813e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java
@@ -72,12 +72,11 @@ private SparseSegmentSqrtNWithNumSegments(Operation operation) {
   public static <T extends TNumber> SparseSegmentSqrtNWithNumSegments<T> create(Scope scope,
       Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
       Operand<? extends TNumber> numSegments) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSqrtNWithNumSegments"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentSqrtNWithNumSegments");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(numSegments.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSegmentSqrtNWithNumSegments<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java
index 2df68c339df..13f9842bbfa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java
@@ -90,11 +90,10 @@ private SparseSegmentSum(Operation operation) {
   )
   public static <T extends TNumber> SparseSegmentSum<T> create(Scope scope, Operand<T> data,
       Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentSum");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSegmentSum<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumGrad.java
new file mode 100644
index 00000000000..c82f3dbab2e
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumGrad.java
@@ -0,0 +1,93 @@
+/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================*/
+
+// This class has been generated, DO NOT EDIT!
+
+package org.tensorflow.op.sparse;
+
+import org.tensorflow.Operand;
+import org.tensorflow.Operation;
+import org.tensorflow.OperationBuilder;
+import org.tensorflow.Output;
+import org.tensorflow.op.RawOp;
+import org.tensorflow.op.Scope;
+import org.tensorflow.op.annotation.Endpoint;
+import org.tensorflow.op.annotation.Operator;
+import org.tensorflow.types.TInt32;
+import org.tensorflow.types.family.TNumber;
+
+/**
+ * Computes gradients for SparseSegmentSum.
+ * Returns tensor &quot;output&quot; with same shape as grad, except for dimension 0 whose
+ * value is output_dim0.
+ *
+ * @param <T> data type for {@code output} output
+ */
+@Operator(
+    group = "sparse"
+)
+public final class SparseSegmentSumGrad<T extends TNumber> extends RawOp implements Operand<T> {
+  /**
+   * The name of this op, as known by TensorFlow core engine
+   */
+  public static final String OP_NAME = "SparseSegmentSumGrad";
+
+  private Output<T> output;
+
+  private SparseSegmentSumGrad(Operation operation) {
+    super(operation);
+    int outputIdx = 0;
+    output = operation.output(outputIdx++);
+  }
+
+  /**
+   * Factory method to create a class wrapping a new SparseSegmentSumGrad operation.
+   *
+   * @param scope current scope
+   * @param grad gradient propagated to the SparseSegmentSum op.
+   * @param indices indices passed to the corresponding SparseSegmentSum op.
+   * @param segmentIds segment_ids passed to the corresponding SparseSegmentSum op.
+   * @param outputDim0 dimension 0 of &quot;data&quot; passed to SparseSegmentSum op.
+   * @param <T> data type for {@code SparseSegmentSumGrad} output and operands
+   * @return a new instance of SparseSegmentSumGrad
+   */
+  @Endpoint(
+      describeByClass = true
+  )
+  public static <T extends TNumber> SparseSegmentSumGrad<T> create(Scope scope, Operand<T> grad,
+      Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
+      Operand<TInt32> outputDim0) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentSumGrad");
+    opBuilder.addInput(grad.asOutput());
+    opBuilder.addInput(indices.asOutput());
+    opBuilder.addInput(segmentIds.asOutput());
+    opBuilder.addInput(outputDim0.asOutput());
+    return new SparseSegmentSumGrad<>(opBuilder.build());
+  }
+
+  /**
+   * Gets output.
+   *
+   * @return output.
+   */
+  public Output<T> output() {
+    return output;
+  }
+
+  @Override
+  public Output<T> asOutput() {
+    return output;
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java
index 8cc379497d3..d67e08a73e5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java
@@ -90,12 +90,11 @@ private SparseSegmentSumWithNumSegments(Operation operation) {
   public static <T extends TNumber> SparseSegmentSumWithNumSegments<T> create(Scope scope,
       Operand<T> data, Operand<? extends TNumber> indices, Operand<? extends TNumber> segmentIds,
       Operand<? extends TNumber> numSegments) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSumWithNumSegments"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSegmentSumWithNumSegments");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(numSegments.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSegmentSumWithNumSegments<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSlice.java
index 6e026b471fc..3afe4ce5fa7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSlice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSlice.java
@@ -91,13 +91,12 @@ private SparseSlice(Operation operation) {
   )
   public static <T extends TType> SparseSlice<T> create(Scope scope, Operand<TInt64> indices,
       Operand<T> values, Operand<TInt64> shape, Operand<TInt64> start, Operand<TInt64> sizeOutput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSlice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSlice");
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(shape.asOutput());
     opBuilder.addInput(start.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSlice<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSliceGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSliceGrad.java
index 06fae6bca46..3e1fc4a3eae 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSliceGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSliceGrad.java
@@ -70,12 +70,11 @@ private SparseSliceGrad(Operation operation) {
   )
   public static <T extends TType> SparseSliceGrad<T> create(Scope scope, Operand<T> backpropValGrad,
       Operand<TInt64> inputIndices, Operand<TInt64> inputStart, Operand<TInt64> outputIndices) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSliceGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSliceGrad");
     opBuilder.addInput(backpropValGrad.asOutput());
     opBuilder.addInput(inputIndices.asOutput());
     opBuilder.addInput(inputStart.asOutput());
     opBuilder.addInput(outputIndices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSliceGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSoftmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSoftmax.java
index 75fc6fa5b76..5259cdc9127 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSoftmax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSoftmax.java
@@ -78,11 +78,10 @@ private SparseSoftmax(Operation operation) {
   )
   public static <T extends TNumber> SparseSoftmax<T> create(Scope scope, Operand<TInt64> spIndices,
       Operand<T> spValues, Operand<TInt64> spShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSoftmax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSoftmax");
     opBuilder.addInput(spIndices.asOutput());
     opBuilder.addInput(spValues.asOutput());
     opBuilder.addInput(spShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSoftmax<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMaximum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMaximum.java
index 8b26b4d31c3..166ae8dc7f2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMaximum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMaximum.java
@@ -74,14 +74,13 @@ private SparseSparseMaximum(Operation operation) {
   public static <T extends TNumber> SparseSparseMaximum<T> create(Scope scope,
       Operand<TInt64> aIndices, Operand<T> aValues, Operand<TInt64> aShape,
       Operand<TInt64> bIndices, Operand<T> bValues, Operand<TInt64> bShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSparseMaximum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSparseMaximum");
     opBuilder.addInput(aIndices.asOutput());
     opBuilder.addInput(aValues.asOutput());
     opBuilder.addInput(aShape.asOutput());
     opBuilder.addInput(bIndices.asOutput());
     opBuilder.addInput(bValues.asOutput());
     opBuilder.addInput(bShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSparseMaximum<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMinimum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMinimum.java
index d4b4102b8b0..01a9ceb7431 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMinimum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMinimum.java
@@ -74,14 +74,13 @@ private SparseSparseMinimum(Operation operation) {
   public static <T extends TType> SparseSparseMinimum<T> create(Scope scope,
       Operand<TInt64> aIndices, Operand<T> aValues, Operand<TInt64> aShape,
       Operand<TInt64> bIndices, Operand<T> bValues, Operand<TInt64> bShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSparseMinimum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSparseMinimum");
     opBuilder.addInput(aIndices.asOutput());
     opBuilder.addInput(aValues.asOutput());
     opBuilder.addInput(aShape.asOutput());
     opBuilder.addInput(bIndices.asOutput());
     opBuilder.addInput(bValues.asOutput());
     opBuilder.addInput(bShape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseSparseMinimum<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSplit.java
index 35da11942be..9154c405640 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSplit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSplit.java
@@ -103,12 +103,11 @@ private SparseSplit(Operation operation) {
   )
   public static <T extends TType> SparseSplit<T> create(Scope scope, Operand<TInt64> splitDim,
       Operand<TInt64> indices, Operand<T> values, Operand<TInt64> shape, Long numSplit) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSplit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseSplit");
     opBuilder.addInput(splitDim.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(values.asOutput());
     opBuilder.addInput(shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_split", numSplit);
     return new SparseSplit<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseAdd.java
index 81261298396..d181580983d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseAdd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseAdd.java
@@ -68,12 +68,11 @@ private SparseTensorDenseAdd(Operation operation) {
   )
   public static <U extends TType, T extends TNumber> SparseTensorDenseAdd<U> create(Scope scope,
       Operand<T> aIndices, Operand<U> aValues, Operand<T> aShape, Operand<U> b) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseTensorDenseAdd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseTensorDenseAdd");
     opBuilder.addInput(aIndices.asOutput());
     opBuilder.addInput(aValues.asOutput());
     opBuilder.addInput(aShape.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SparseTensorDenseAdd<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java
index 4c89fcc00d9..346b2917327 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java
@@ -77,12 +77,11 @@ private SparseTensorDenseMatMul(Operation operation) {
   public static <U extends TType> SparseTensorDenseMatMul<U> create(Scope scope,
       Operand<? extends TNumber> aIndices, Operand<U> aValues, Operand<TInt64> aShape, Operand<U> b,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseTensorDenseMatMul"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseTensorDenseMatMul");
     opBuilder.addInput(aIndices.asOutput());
     opBuilder.addInput(aValues.asOutput());
     opBuilder.addInput(aShape.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.adjointA != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToDense.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToDense.java
index 6d24b010ace..63fed696d31 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToDense.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToDense.java
@@ -88,12 +88,11 @@ private SparseToDense(Operation operation) {
   public static <U extends TType, T extends TNumber> SparseToDense<U> create(Scope scope,
       Operand<T> sparseIndices, Operand<T> outputShape, Operand<U> sparseValues,
       Operand<U> defaultValue, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseToDense"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseToDense");
     opBuilder.addInput(sparseIndices.asOutput());
     opBuilder.addInput(outputShape.asOutput());
     opBuilder.addInput(sparseValues.asOutput());
     opBuilder.addInput(defaultValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.validateIndices != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToSparseSetOperation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToSparseSetOperation.java
index ac968d5dce7..1877c8cbed5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToSparseSetOperation.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToSparseSetOperation.java
@@ -104,14 +104,13 @@ public static <T extends TType> SparseToSparseSetOperation<T> create(Scope scope
       Operand<TInt64> set1Indices, Operand<T> set1Values, Operand<TInt64> set1Shape,
       Operand<TInt64> set2Indices, Operand<T> set2Values, Operand<TInt64> set2Shape,
       String setOperation, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseToSparseSetOperation"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseToSparseSetOperation");
     opBuilder.addInput(set1Indices.asOutput());
     opBuilder.addInput(set1Values.asOutput());
     opBuilder.addInput(set1Shape.asOutput());
     opBuilder.addInput(set2Indices.asOutput());
     opBuilder.addInput(set2Values.asOutput());
     opBuilder.addInput(set2Shape.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("set_operation", setOperation);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/TakeManySparseFromTensorsMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/TakeManySparseFromTensorsMap.java
index bc913bd875d..0f0e504a484 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/TakeManySparseFromTensorsMap.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/TakeManySparseFromTensorsMap.java
@@ -114,9 +114,8 @@ private TakeManySparseFromTensorsMap(Operation operation) {
   )
   public static <T extends TType> TakeManySparseFromTensorsMap<T> create(Scope scope,
       Operand<TInt64> sparseHandles, Class<T> dtype, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TakeManySparseFromTensorsMap"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TakeManySparseFromTensorsMap");
     opBuilder.addInput(sparseHandles.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Join.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Join.java
index a654b7428b9..0edb7c882ce 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Join.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Join.java
@@ -73,9 +73,8 @@ private Join(Operation operation) {
       describeByClass = true
   )
   public static Join create(Scope scope, Iterable<Operand<TString>> inputs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Join"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Join");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.separator != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Lower.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Lower.java
index e3e322c9a22..61b4a5664e6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Lower.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Lower.java
@@ -60,7 +60,7 @@ private Lower(Operation operation) {
    * Factory method to create a class wrapping a new StringLower operation.
    *
    * @param scope current scope
-   * @param input the input value
+   * @param input The input to be lower-cased.
    * @param options carries optional attribute values
    * @return a new instance of Lower
    */
@@ -68,9 +68,8 @@ private Lower(Operation operation) {
       describeByClass = true
   )
   public static Lower create(Scope scope, Operand<TString> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Lower"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Lower");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.encoding != null) {
@@ -84,7 +83,8 @@ public static Lower create(Scope scope, Operand<TString> input, Options... optio
   /**
    * Sets the encoding option.
    *
-   * @param encoding the encoding option
+   * @param encoding Character encoding of {@code input}. Allowed values are '' and 'utf-8'.
+   * Value '' is interpreted as ASCII.
    * @return this Options instance.
    */
   public static Options encoding(String encoding) {
@@ -117,7 +117,8 @@ private Options() {
     /**
      * Sets the encoding option.
      *
-     * @param encoding the encoding option
+     * @param encoding Character encoding of {@code input}. Allowed values are '' and 'utf-8'.
+     * Value '' is interpreted as ASCII.
      * @return this Options instance.
      */
     public Options encoding(String encoding) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ReduceJoin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ReduceJoin.java
index b7d16e40739..4e914486e2a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ReduceJoin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ReduceJoin.java
@@ -85,10 +85,9 @@ private ReduceJoin(Operation operation) {
   )
   public static ReduceJoin create(Scope scope, Operand<TString> inputs,
       Operand<TInt32> reductionIndices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceJoin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceJoin");
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(reductionIndices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.keepDims != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexFullMatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexFullMatch.java
index e12d78a14fe..17fd9dddcc7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexFullMatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexFullMatch.java
@@ -77,10 +77,9 @@ private RegexFullMatch(Operation operation) {
   )
   public static RegexFullMatch create(Scope scope, Operand<TString> input,
       Operand<TString> pattern) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RegexFullMatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RegexFullMatch");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(pattern.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new RegexFullMatch(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexReplace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexReplace.java
index f3c822e6665..535d46e9897 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexReplace.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexReplace.java
@@ -65,11 +65,10 @@ private RegexReplace(Operation operation) {
   )
   public static RegexReplace create(Scope scope, Operand<TString> input, Operand<TString> pattern,
       Operand<TString> rewrite, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RegexReplace"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RegexReplace");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(pattern.asOutput());
     opBuilder.addInput(rewrite.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.replaceGlobal != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexFullMatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexFullMatch.java
index 02380fe50d7..1eba6e9c223 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexFullMatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexFullMatch.java
@@ -61,9 +61,8 @@ private StaticRegexFullMatch(Operation operation) {
       describeByClass = true
   )
   public static StaticRegexFullMatch create(Scope scope, Operand<TString> input, String pattern) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StaticRegexFullMatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StaticRegexFullMatch");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("pattern", pattern);
     return new StaticRegexFullMatch(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexReplace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexReplace.java
index 30d9eea653f..565437356c0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexReplace.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexReplace.java
@@ -59,9 +59,8 @@ private StaticRegexReplace(Operation operation) {
   )
   public static StaticRegexReplace create(Scope scope, Operand<TString> input, String pattern,
       String rewrite, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StaticRegexReplace"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StaticRegexReplace");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("pattern", pattern);
     opBuilder.setAttr("rewrite", rewrite);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringFormat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringFormat.java
index 22de96a3b4f..73e13bc795a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringFormat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringFormat.java
@@ -61,9 +61,8 @@ private StringFormat(Operation operation) {
       describeByClass = true
   )
   public static StringFormat create(Scope scope, Iterable<Operand<?>> inputs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StringFormat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StringFormat");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.template != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringLength.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringLength.java
index 5f2984ffcd4..cab105ec8ee 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringLength.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringLength.java
@@ -72,9 +72,8 @@ private StringLength(Operation operation) {
       describeByClass = true
   )
   public static StringLength create(Scope scope, Operand<TString> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StringLength"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StringLength");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.unit != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringNGrams.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringNGrams.java
index 5c8b8d5142d..c768a8cd421 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringNGrams.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringNGrams.java
@@ -84,10 +84,9 @@ private StringNGrams(Operation operation) {
   public static <T extends TNumber> StringNGrams<T> create(Scope scope, Operand<TString> data,
       Operand<T> dataSplits, String separator, List<Long> ngramWidths, String leftPad,
       String rightPad, Long padWidth, Boolean preserveShortSequences) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StringNGrams"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StringNGrams");
     opBuilder.addInput(data.asOutput());
     opBuilder.addInput(dataSplits.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("separator", separator);
     long[] ngramWidthsArray = new long[ngramWidths.size()];
     for (int i = 0 ; i < ngramWidthsArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringSplit.java
index cf3975f9db5..51a137ca33b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringSplit.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringSplit.java
@@ -89,10 +89,9 @@ private StringSplit(Operation operation) {
   )
   public static StringSplit create(Scope scope, Operand<TString> input, Operand<TString> sep,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StringSplit"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StringSplit");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(sep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.maxsplit != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Strip.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Strip.java
index 6cfd6d3ab58..afd03047152 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Strip.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Strip.java
@@ -29,6 +29,15 @@
 
 /**
  * Strip leading and trailing whitespaces from the Tensor.
+ * Examples:
+ * <blockquote>
+ * <blockquote>
+ * <blockquote>
+ * <p>tf.strings.strip([&quot;\nTensorFlow&quot;, &quot;     The python library    &quot;]).numpy()
+ * array([b'TensorFlow', b'The python library'], dtype=object)
+ * </blockquote>
+ * </blockquote>
+ * </blockquote>
  */
 @Operator(
     group = "strings"
@@ -58,24 +67,14 @@ private Strip(Operation operation) {
       describeByClass = true
   )
   public static Strip create(Scope scope, Operand<TString> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Strip"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Strip");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Strip(opBuilder.build());
   }
 
   /**
    * Gets output.
    * A string {@code Tensor} of the same shape as the input.
-   * <p>Examples:
-   * <blockquote>
-   * <blockquote>
-   * <blockquote>
-   * <p>tf.strings.strip([&quot;\nTensorFlow&quot;, &quot;     The python library    &quot;]).numpy()
-   * array([b'TensorFlow', b'The python library'], dtype=object)
-   * </blockquote>
-   * </blockquote>
-   * </blockquote>
    * @return output.
    */
   public Output<TString> output() {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Substr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Substr.java
index 4cad2a56b3a..fae4b2a26ec 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Substr.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Substr.java
@@ -131,11 +131,10 @@ private Substr(Operation operation) {
   )
   public static <T extends TNumber> Substr create(Scope scope, Operand<TString> input,
       Operand<T> pos, Operand<T> len, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Substr"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Substr");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(pos.asOutput());
     opBuilder.addInput(len.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.unit != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucket.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucket.java
index 02e3d2455a9..17e4f6946d3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucket.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucket.java
@@ -65,9 +65,8 @@ private ToHashBucket(Operation operation) {
       describeByClass = true
   )
   public static ToHashBucket create(Scope scope, Operand<TString> stringTensor, Long numBuckets) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToHashBucket"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ToHashBucket");
     opBuilder.addInput(stringTensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_buckets", numBuckets);
     return new ToHashBucket(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketFast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketFast.java
index baa4b880028..5e85fc085a7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketFast.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketFast.java
@@ -75,9 +75,8 @@ private ToHashBucketFast(Operation operation) {
       describeByClass = true
   )
   public static ToHashBucketFast create(Scope scope, Operand<TString> input, Long numBuckets) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToHashBucketFast"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ToHashBucketFast");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_buckets", numBuckets);
     return new ToHashBucketFast(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketStrong.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketStrong.java
index 93f3ba45fab..9cf389be380 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketStrong.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketStrong.java
@@ -84,9 +84,8 @@ private ToHashBucketStrong(Operation operation) {
   )
   public static ToHashBucketStrong create(Scope scope, Operand<TString> input, Long numBuckets,
       List<Long> key) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToHashBucketStrong"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ToHashBucketStrong");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_buckets", numBuckets);
     long[] keyArray = new long[key.size()];
     for (int i = 0 ; i < keyArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToNumber.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToNumber.java
index 76eb22c44d1..733233bdba9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToNumber.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToNumber.java
@@ -78,9 +78,8 @@ private ToNumber(Operation operation) {
   )
   public static <T extends TNumber> ToNumber<T> create(Scope scope, Operand<TString> stringTensor,
       Class<T> outType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToNumber"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ToNumber");
     opBuilder.addInput(stringTensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("out_type", Operands.toDataType(outType));
     return new ToNumber<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecode.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecode.java
index aace664a5f4..9640d30b1c1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecode.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecode.java
@@ -83,9 +83,8 @@ private UnicodeDecode(Operation operation) {
   )
   public static <T extends TNumber> UnicodeDecode<T> create(Scope scope, Operand<TString> input,
       String inputEncoding, Class<T> Tsplits, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeDecode"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnicodeDecode");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("input_encoding", inputEncoding);
     opBuilder.setAttr("Tsplits", Operands.toDataType(Tsplits));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecodeWithOffsets.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecodeWithOffsets.java
index c852eefe39f..0cb5419064a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecodeWithOffsets.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecodeWithOffsets.java
@@ -90,9 +90,8 @@ private UnicodeDecodeWithOffsets(Operation operation) {
   )
   public static <T extends TNumber> UnicodeDecodeWithOffsets<T> create(Scope scope,
       Operand<TString> input, String inputEncoding, Class<T> Tsplits, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeDecodeWithOffsets"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnicodeDecodeWithOffsets");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("input_encoding", inputEncoding);
     opBuilder.setAttr("Tsplits", Operands.toDataType(Tsplits));
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java
index e6c9682af5f..31270365f6b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java
@@ -74,10 +74,9 @@ private UnicodeEncode(Operation operation) {
   )
   public static UnicodeEncode create(Scope scope, Operand<TInt32> inputValues,
       Operand<? extends TNumber> inputSplits, String outputEncoding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeEncode"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnicodeEncode");
     opBuilder.addInput(inputValues.asOutput());
     opBuilder.addInput(inputSplits.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("output_encoding", outputEncoding);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeScript.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeScript.java
index c700724b2f7..ea638c3aad7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeScript.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeScript.java
@@ -77,9 +77,8 @@ private UnicodeScript(Operation operation) {
       describeByClass = true
   )
   public static UnicodeScript create(Scope scope, Operand<TInt32> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeScript"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnicodeScript");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new UnicodeScript(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeTranscode.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeTranscode.java
index 6a296716025..b200bf64022 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeTranscode.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeTranscode.java
@@ -99,9 +99,8 @@ private UnicodeTranscode(Operation operation) {
   )
   public static UnicodeTranscode create(Scope scope, Operand<TString> input, String inputEncoding,
       String outputEncoding, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeTranscode"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnicodeTranscode");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("input_encoding", inputEncoding);
     opBuilder.setAttr("output_encoding", outputEncoding);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java
index 1a756c7c70b..cbd8c518994 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java
@@ -89,11 +89,10 @@ private UnsortedSegmentJoin(Operation operation) {
   public static UnsortedSegmentJoin create(Scope scope, Operand<TString> inputs,
       Operand<? extends TNumber> segmentIds, Operand<? extends TNumber> numSegments,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentJoin"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "UnsortedSegmentJoin");
     opBuilder.addInput(inputs.asOutput());
     opBuilder.addInput(segmentIds.asOutput());
     opBuilder.addInput(numSegments.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.separator != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Upper.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Upper.java
index b92a1b2c23d..8e8b0c06ff9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Upper.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Upper.java
@@ -60,7 +60,7 @@ private Upper(Operation operation) {
    * Factory method to create a class wrapping a new StringUpper operation.
    *
    * @param scope current scope
-   * @param input the input value
+   * @param input The input to be upper-cased.
    * @param options carries optional attribute values
    * @return a new instance of Upper
    */
@@ -68,9 +68,8 @@ private Upper(Operation operation) {
       describeByClass = true
   )
   public static Upper create(Scope scope, Operand<TString> input, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Upper"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Upper");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.encoding != null) {
@@ -84,7 +83,8 @@ public static Upper create(Scope scope, Operand<TString> input, Options... optio
   /**
    * Sets the encoding option.
    *
-   * @param encoding the encoding option
+   * @param encoding Character encoding of {@code input}. Allowed values are '' and 'utf-8'.
+   * Value '' is interpreted as ASCII.
    * @return this Options instance.
    */
   public static Options encoding(String encoding) {
@@ -117,7 +117,8 @@ private Options() {
     /**
      * Sets the encoding option.
      *
-     * @param encoding the encoding option
+     * @param encoding Character encoding of {@code input}. Allowed values are '' and 'utf-8'.
+     * Value '' is interpreted as ASCII.
      * @return this Options instance.
      */
     public Options encoding(String encoding) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/AudioSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/AudioSummary.java
index 0bfef4f10d8..a971795dd2d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/AudioSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/AudioSummary.java
@@ -73,11 +73,10 @@ private AudioSummary(Operation operation) {
   )
   public static AudioSummary create(Scope scope, Operand<TString> tag, Operand<TFloat32> tensor,
       Operand<TFloat32> sampleRate, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AudioSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AudioSummary");
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(sampleRate.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.maxOutputs != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CloseSummaryWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CloseSummaryWriter.java
index 607d303ca66..c7bb55643da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CloseSummaryWriter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CloseSummaryWriter.java
@@ -49,9 +49,8 @@ private CloseSummaryWriter(Operation operation) {
       describeByClass = true
   )
   public static CloseSummaryWriter create(Scope scope, Operand<? extends TType> writer) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CloseSummaryWriter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CloseSummaryWriter");
     opBuilder.addInput(writer.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new CloseSummaryWriter(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryDbWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryDbWriter.java
index d65c5be39c6..c7dc8ec117f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryDbWriter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryDbWriter.java
@@ -56,13 +56,12 @@ private CreateSummaryDbWriter(Operation operation) {
   public static CreateSummaryDbWriter create(Scope scope, Operand<? extends TType> writer,
       Operand<TString> dbUri, Operand<TString> experimentName, Operand<TString> runName,
       Operand<TString> userName) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CreateSummaryDbWriter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CreateSummaryDbWriter");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(dbUri.asOutput());
     opBuilder.addInput(experimentName.asOutput());
     opBuilder.addInput(runName.asOutput());
     opBuilder.addInput(userName.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new CreateSummaryDbWriter(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryFileWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryFileWriter.java
index 12624b660bd..cc448613793 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryFileWriter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryFileWriter.java
@@ -57,13 +57,12 @@ private CreateSummaryFileWriter(Operation operation) {
   public static CreateSummaryFileWriter create(Scope scope, Operand<? extends TType> writer,
       Operand<TString> logdir, Operand<TInt32> maxQueue, Operand<TInt32> flushMillis,
       Operand<TString> filenameSuffix) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CreateSummaryFileWriter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CreateSummaryFileWriter");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(logdir.asOutput());
     opBuilder.addInput(maxQueue.asOutput());
     opBuilder.addInput(flushMillis.asOutput());
     opBuilder.addInput(filenameSuffix.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new CreateSummaryFileWriter(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/FlushSummaryWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/FlushSummaryWriter.java
index f84a9a7eb4e..e2756661a48 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/FlushSummaryWriter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/FlushSummaryWriter.java
@@ -49,9 +49,8 @@ private FlushSummaryWriter(Operation operation) {
       describeByClass = true
   )
   public static FlushSummaryWriter create(Scope scope, Operand<? extends TType> writer) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FlushSummaryWriter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "FlushSummaryWriter");
     opBuilder.addInput(writer.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new FlushSummaryWriter(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java
index c9ecf68ef74..0c5ab5b5eec 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java
@@ -65,10 +65,9 @@ private HistogramSummary(Operation operation) {
   )
   public static HistogramSummary create(Scope scope, Operand<TString> tag,
       Operand<? extends TNumber> values) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("HistogramSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "HistogramSummary");
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new HistogramSummary(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java
index 468a708ed83..f9685d3e7ce 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java
@@ -99,10 +99,9 @@ private ImageSummary(Operation operation) {
   )
   public static ImageSummary create(Scope scope, Operand<TString> tag,
       Operand<? extends TNumber> tensor, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImageSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ImageSummary");
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.maxImages != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImportEvent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImportEvent.java
index 0ad13d03818..4eb68fbc68d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImportEvent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImportEvent.java
@@ -52,10 +52,9 @@ private ImportEvent(Operation operation) {
   )
   public static ImportEvent create(Scope scope, Operand<? extends TType> writer,
       Operand<TString> event) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImportEvent"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ImportEvent");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(event.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ImportEvent(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/MergeSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/MergeSummary.java
index ac2517267d0..c52ddaac7a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/MergeSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/MergeSummary.java
@@ -66,9 +66,8 @@ private MergeSummary(Operation operation) {
       describeByClass = true
   )
   public static MergeSummary create(Scope scope, Iterable<Operand<TString>> inputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MergeSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MergeSummary");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     return new MergeSummary(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java
index 80c065a4e5f..a41165f3327 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java
@@ -63,10 +63,9 @@ private ScalarSummary(Operation operation) {
   )
   public static ScalarSummary create(Scope scope, Operand<TString> tags,
       Operand<? extends TNumber> values) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScalarSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ScalarSummary");
     opBuilder.addInput(tags.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ScalarSummary(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/StatsAggregatorSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/StatsAggregatorSummary.java
index 4a60bfc3b67..8c6ce2b25d2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/StatsAggregatorSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/StatsAggregatorSummary.java
@@ -55,9 +55,8 @@ private StatsAggregatorSummary(Operation operation) {
       describeByClass = true
   )
   public static StatsAggregatorSummary create(Scope scope, Operand<? extends TType> iterator) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "StatsAggregatorSummary");
     opBuilder.addInput(iterator.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new StatsAggregatorSummary(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/SummaryWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/SummaryWriter.java
index 7a96cfb9d61..3183ca16a90 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/SummaryWriter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/SummaryWriter.java
@@ -55,8 +55,7 @@ private SummaryWriter(Operation operation) {
       describeByClass = true
   )
   public static SummaryWriter create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SummaryWriter"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SummaryWriter");
     if (options != null) {
       for (Options opts : options) {
         if (opts.sharedName != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java
index 7c303f23449..573a9961992 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java
@@ -63,11 +63,10 @@ private TensorSummary(Operation operation) {
   )
   public static TensorSummary create(Scope scope, Operand<TString> tag,
       Operand<? extends TType> tensor, Operand<TString> serializedSummaryMetadata) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TensorSummary");
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(serializedSummaryMetadata.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TensorSummary(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteAudioSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteAudioSummary.java
index 34c5c37773b..2163effbc50 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteAudioSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteAudioSummary.java
@@ -61,13 +61,12 @@ private WriteAudioSummary(Operation operation) {
   public static WriteAudioSummary create(Scope scope, Operand<? extends TType> writer,
       Operand<TInt64> step, Operand<TString> tag, Operand<TFloat32> tensor,
       Operand<TFloat32> sampleRate, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteAudioSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WriteAudioSummary");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(sampleRate.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.maxOutputs != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteGraphSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteGraphSummary.java
index 039430491ad..725f481eab9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteGraphSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteGraphSummary.java
@@ -55,11 +55,10 @@ private WriteGraphSummary(Operation operation) {
   )
   public static WriteGraphSummary create(Scope scope, Operand<? extends TType> writer,
       Operand<TInt64> step, Operand<TString> tensor) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteGraphSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WriteGraphSummary");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new WriteGraphSummary(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java
index 19a50b23491..b82701d2fec 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java
@@ -25,7 +25,6 @@
 import org.tensorflow.op.annotation.Endpoint;
 import org.tensorflow.types.TInt64;
 import org.tensorflow.types.TString;
-import org.tensorflow.types.family.TNumber;
 import org.tensorflow.types.family.TType;
 
 /**
@@ -56,13 +55,12 @@ private WriteHistogramSummary(Operation operation) {
       describeByClass = true
   )
   public static WriteHistogramSummary create(Scope scope, Operand<? extends TType> writer,
-      Operand<TInt64> step, Operand<TString> tag, Operand<? extends TNumber> values) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteHistogramSummary"));
+      Operand<TInt64> step, Operand<TString> tag, Operand<? extends TType> values) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WriteHistogramSummary");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new WriteHistogramSummary(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java
index 1f00bdaa30c..374525fd3c0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java
@@ -62,13 +62,12 @@ private WriteImageSummary(Operation operation) {
   public static WriteImageSummary create(Scope scope, Operand<? extends TType> writer,
       Operand<TInt64> step, Operand<TString> tag, Operand<? extends TNumber> tensor,
       Operand<TUint8> badColor, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteImageSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WriteImageSummary");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(badColor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.maxImages != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteRawProtoSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteRawProtoSummary.java
index 21d7c92bb5c..47ab6026a7f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteRawProtoSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteRawProtoSummary.java
@@ -55,11 +55,10 @@ private WriteRawProtoSummary(Operation operation) {
   )
   public static WriteRawProtoSummary create(Scope scope, Operand<? extends TType> writer,
       Operand<TInt64> step, Operand<TString> tensor) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteRawProtoSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WriteRawProtoSummary");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new WriteRawProtoSummary(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java
index 2721b1b1f9a..9313cff199e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java
@@ -57,12 +57,11 @@ private WriteScalarSummary(Operation operation) {
   )
   public static WriteScalarSummary create(Scope scope, Operand<? extends TType> writer,
       Operand<TInt64> step, Operand<TString> tag, Operand<? extends TNumber> value) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteScalarSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WriteScalarSummary");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(value.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new WriteScalarSummary(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java
index be3a6ee4c9e..2783d80ea64 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java
@@ -58,13 +58,12 @@ private WriteSummary(Operation operation) {
   public static WriteSummary create(Scope scope, Operand<? extends TType> writer,
       Operand<TInt64> step, Operand<? extends TType> tensor, Operand<TString> tag,
       Operand<TString> summaryMetadata) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteSummary"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WriteSummary");
     opBuilder.addInput(writer.asOutput());
     opBuilder.addInput(step.asOutput());
     opBuilder.addInput(tensor.asOutput());
     opBuilder.addInput(tag.asOutput());
     opBuilder.addInput(summaryMetadata.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new WriteSummary(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/AllToAll.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/AllToAll.java
index e43c65b899a..34599cbbbda 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/AllToAll.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/AllToAll.java
@@ -79,10 +79,9 @@ private AllToAll(Operation operation) {
   )
   public static <T extends TType> AllToAll<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> groupAssignment, Long concatDimension, Long splitDimension, Long splitCount) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AllToAll"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AllToAll");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(groupAssignment.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("concat_dimension", concatDimension);
     opBuilder.setAttr("split_dimension", splitDimension);
     opBuilder.setAttr("split_count", splitCount);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CollectivePermute.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CollectivePermute.java
index 12ff7ad72f6..3083821cf79 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CollectivePermute.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CollectivePermute.java
@@ -65,10 +65,9 @@ private CollectivePermute(Operation operation) {
   )
   public static <T extends TType> CollectivePermute<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> sourceTargetPairs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CollectivePermute"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CollectivePermute");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(sourceTargetPairs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new CollectivePermute<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompilationResult.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompilationResult.java
index 5cf2ef9cf74..7811ec35db4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompilationResult.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompilationResult.java
@@ -56,8 +56,7 @@ private CompilationResult(Operation operation) {
       describeByClass = true
   )
   public static CompilationResult create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CompilationResult"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CompilationResult");
     return new CompilationResult(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Compile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Compile.java
index 43725ba9b0b..7442a387d67 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Compile.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Compile.java
@@ -95,10 +95,9 @@ private Compile(Operation operation) {
   public static Compile create(Scope scope, Iterable<Operand<TInt64>> dynamicShapes,
       Iterable<Operand<?>> guaranteedConstants, Long numComputations, ConcreteFunction function,
       String metadata) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Compile"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Compile");
     opBuilder.addInputList(Operands.asOutputs(dynamicShapes));
     opBuilder.addInputList(Operands.asOutputs(guaranteedConstants));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_computations", numComputations);
     opBuilder.setAttr("function", function);
     opBuilder.setAttr("metadata", metadata);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompileSucceededAssert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompileSucceededAssert.java
index b002f863531..31e5550bdb8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompileSucceededAssert.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompileSucceededAssert.java
@@ -27,8 +27,9 @@
 import org.tensorflow.types.TString;
 
 /**
- * Asserts that compilation succeeded. This op produces no output and closes the
- * device during failure to ensure all pending device interactions fail.
+ * Asserts that compilation succeeded.
+ * This op produces no output and closes the device during failure to ensure all
+ * pending device interactions fail.
  * <p>'compilation_status' is a serialized CompilationResultProto.
  */
 @Operator(
@@ -55,9 +56,8 @@ private CompileSucceededAssert(Operation operation) {
       describeByClass = true
   )
   public static CompileSucceededAssert create(Scope scope, Operand<TString> compilationStatus) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CompileSucceededAssert"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CompileSucceededAssert");
     opBuilder.addInput(compilationStatus.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new CompileSucceededAssert(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureDistributedTPU.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureDistributedTPU.java
index 0edbc20997b..bfbed670d1e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureDistributedTPU.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureDistributedTPU.java
@@ -54,8 +54,7 @@ private ConfigureDistributedTPU(Operation operation) {
       describeByClass = true
   )
   public static ConfigureDistributedTPU create(Scope scope, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConfigureDistributedTPU"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ConfigureDistributedTPU");
     if (options != null) {
       for (Options opts : options) {
         if (opts.embeddingConfig != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureTPUEmbedding.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureTPUEmbedding.java
index 8adbdbfca5d..0a9aa88e9a5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureTPUEmbedding.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureTPUEmbedding.java
@@ -48,8 +48,7 @@ private ConfigureTPUEmbedding(Operation operation) {
       describeByClass = true
   )
   public static ConfigureTPUEmbedding create(Scope scope, String config) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConfigureTPUEmbedding"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ConfigureTPUEmbedding");
     opBuilder.setAttr("config", config);
     return new ConfigureTPUEmbedding(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CrossReplicaSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CrossReplicaSum.java
index f372af713b9..c1267521173 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CrossReplicaSum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CrossReplicaSum.java
@@ -67,10 +67,9 @@ private CrossReplicaSum(Operation operation) {
   )
   public static <T extends TNumber> CrossReplicaSum<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> groupAssignment) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CrossReplicaSum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "CrossReplicaSum");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(groupAssignment.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new CrossReplicaSum<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EmbeddingActivations.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EmbeddingActivations.java
index f334ee32906..0c98c598a4c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EmbeddingActivations.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EmbeddingActivations.java
@@ -65,10 +65,9 @@ private EmbeddingActivations(Operation operation) {
   )
   public static EmbeddingActivations create(Scope scope, Operand<TFloat32> embeddingVariable,
       Operand<TFloat32> slicedActivations, Long tableId, Long lookupId) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EmbeddingActivations"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EmbeddingActivations");
     opBuilder.addInput(embeddingVariable.asOutput());
     opBuilder.addInput(slicedActivations.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("table_id", tableId);
     opBuilder.setAttr("lookup_id", lookupId);
     return new EmbeddingActivations(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingIntegerBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingIntegerBatch.java
index 5856d48053f..d80625786c5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingIntegerBatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingIntegerBatch.java
@@ -58,10 +58,9 @@ private EnqueueTPUEmbeddingIntegerBatch(Operation operation) {
   )
   public static EnqueueTPUEmbeddingIntegerBatch create(Scope scope, Iterable<Operand<TInt32>> batch,
       Operand<TString> modeOverride, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnqueueTPUEmbeddingIntegerBatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EnqueueTPUEmbeddingIntegerBatch");
     opBuilder.addInputList(Operands.asOutputs(batch));
     opBuilder.addInput(modeOverride.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.deviceOrdinal != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingRaggedTensorBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingRaggedTensorBatch.java
index 16db6381f07..e63d8e5e7c1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingRaggedTensorBatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingRaggedTensorBatch.java
@@ -83,12 +83,11 @@ public static EnqueueTPUEmbeddingRaggedTensorBatch create(Scope scope,
       Iterable<Operand<? extends TNumber>> embeddingIndices,
       Iterable<Operand<? extends TNumber>> aggregationWeights, Operand<TString> modeOverride,
       List<Long> tableIds, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnqueueTPUEmbeddingRaggedTensorBatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EnqueueTPUEmbeddingRaggedTensorBatch");
     opBuilder.addInputList(Operands.asOutputs(sampleSplits));
     opBuilder.addInputList(Operands.asOutputs(embeddingIndices));
     opBuilder.addInputList(Operands.asOutputs(aggregationWeights));
     opBuilder.addInput(modeOverride.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] tableIdsArray = new long[tableIds.size()];
     for (int i = 0 ; i < tableIdsArray.length ; i++) {
       tableIdsArray[i] = tableIds.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseBatch.java
index 6c28d685060..af6164c23e5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseBatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseBatch.java
@@ -77,12 +77,11 @@ public static EnqueueTPUEmbeddingSparseBatch create(Scope scope,
       Iterable<Operand<? extends TNumber>> embeddingIndices,
       Iterable<Operand<? extends TNumber>> aggregationWeights, Operand<TString> modeOverride,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnqueueTPUEmbeddingSparseBatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EnqueueTPUEmbeddingSparseBatch");
     opBuilder.addInputList(Operands.asOutputs(sampleIndices));
     opBuilder.addInputList(Operands.asOutputs(embeddingIndices));
     opBuilder.addInputList(Operands.asOutputs(aggregationWeights));
     opBuilder.addInput(modeOverride.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.deviceOrdinal != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseTensorBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseTensorBatch.java
index 0eb292670a2..a153a5c005e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseTensorBatch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseTensorBatch.java
@@ -81,12 +81,11 @@ public static EnqueueTPUEmbeddingSparseTensorBatch create(Scope scope,
       Iterable<Operand<? extends TNumber>> embeddingIndices,
       Iterable<Operand<? extends TNumber>> aggregationWeights, Operand<TString> modeOverride,
       List<Long> tableIds, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnqueueTPUEmbeddingSparseTensorBatch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "EnqueueTPUEmbeddingSparseTensorBatch");
     opBuilder.addInputList(Operands.asOutputs(sampleIndices));
     opBuilder.addInputList(Operands.asOutputs(embeddingIndices));
     opBuilder.addInputList(Operands.asOutputs(aggregationWeights));
     opBuilder.addInput(modeOverride.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] tableIdsArray = new long[tableIds.size()];
     for (int i = 0 ; i < tableIdsArray.length ; i++) {
       tableIdsArray[i] = tableIds.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Execute.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Execute.java
index d1f340b993c..d525ac67f35 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Execute.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Execute.java
@@ -70,10 +70,9 @@ private Execute(Operation operation) {
   )
   public static Execute create(Scope scope, Iterable<Operand<?>> args, Operand<TString> key,
       List<Class<? extends TType>> Tresults) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Execute"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Execute");
     opBuilder.addInputList(Operands.asOutputs(args));
     opBuilder.addInput(key.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tresults", Operands.toDataTypes(Tresults));
     return new Execute(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ExecuteAndUpdateVariables.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ExecuteAndUpdateVariables.java
index d5ead20179b..9b3cbe0100e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ExecuteAndUpdateVariables.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ExecuteAndUpdateVariables.java
@@ -79,10 +79,9 @@ private ExecuteAndUpdateVariables(Operation operation) {
   public static ExecuteAndUpdateVariables create(Scope scope, Iterable<Operand<?>> args,
       Operand<TString> key, List<Class<? extends TType>> Tresults, List<Long> deviceVarReadsIndices,
       List<Long> deviceVarUpdatesIndices) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExecuteAndUpdateVariables"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ExecuteAndUpdateVariables");
     opBuilder.addInputList(Operands.asOutputs(args));
     opBuilder.addInput(key.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tresults", Operands.toDataTypes(Tresults));
     long[] deviceVarReadsIndicesArray = new long[deviceVarReadsIndices.size()];
     for (int i = 0 ; i < deviceVarReadsIndicesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeue.java
index 753afadb6d8..9133d876829 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeue.java
@@ -61,8 +61,7 @@ private InfeedDequeue(Operation operation) {
   )
   public static <T extends TType> InfeedDequeue<T> create(Scope scope, Class<T> dtype,
       Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedDequeue"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InfeedDequeue");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("shape", shape);
     return new InfeedDequeue<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeueTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeueTuple.java
index cc138f3e1fc..25c5bb5f3d2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeueTuple.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeueTuple.java
@@ -64,8 +64,7 @@ private InfeedDequeueTuple(Operation operation) {
   )
   public static InfeedDequeueTuple create(Scope scope, List<Class<? extends TType>> dtypes,
       List<Shape> shapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedDequeueTuple"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InfeedDequeueTuple");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     Shape[] shapesArray = new Shape[shapes.size()];
     for (int i = 0 ; i < shapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java
index 8a578770116..54c1c436dae 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java
@@ -54,9 +54,8 @@ private InfeedEnqueue(Operation operation) {
   )
   public static InfeedEnqueue create(Scope scope, Operand<? extends TType> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedEnqueue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InfeedEnqueue");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.shape != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueuePrelinearizedBuffer.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueuePrelinearizedBuffer.java
index ce94c83e3cc..e2e31f1e1a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueuePrelinearizedBuffer.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueuePrelinearizedBuffer.java
@@ -51,9 +51,8 @@ private InfeedEnqueuePrelinearizedBuffer(Operation operation) {
   )
   public static InfeedEnqueuePrelinearizedBuffer create(Scope scope, Operand<? extends TType> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedEnqueuePrelinearizedBuffer"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InfeedEnqueuePrelinearizedBuffer");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.deviceOrdinal != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueueTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueueTuple.java
index 498c1a56d37..1e4e5275ab9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueueTuple.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueueTuple.java
@@ -55,9 +55,8 @@ private InfeedEnqueueTuple(Operation operation) {
   )
   public static InfeedEnqueueTuple create(Scope scope, Iterable<Operand<?>> inputs,
       List<Shape> shapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedEnqueueTuple"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "InfeedEnqueueTuple");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     Shape[] shapesArray = new Shape[shapes.size()];
     for (int i = 0 ; i < shapesArray.length ; i++) {
       shapesArray[i] = shapes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParameters.java
index 5abbb44190b..9fbc8ce5bb3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParameters.java
@@ -61,11 +61,10 @@ private LoadTPUEmbeddingADAMParameters(Operation operation) {
   public static LoadTPUEmbeddingADAMParameters create(Scope scope, Operand<TFloat32> parameters,
       Operand<TFloat32> momenta, Operand<TFloat32> velocities, Long numShards, Long shardId,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingADAMParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingADAMParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(momenta.asOutput());
     opBuilder.addInput(velocities.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java
index 6e22d829faf..e6a19adf6b8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java
@@ -62,12 +62,11 @@ private LoadTPUEmbeddingADAMParametersGradAccumDebug(Operation operation) {
   public static LoadTPUEmbeddingADAMParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> momenta, Operand<TFloat32> velocities,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingADAMParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingADAMParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(momenta.asOutput());
     opBuilder.addInput(velocities.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java
index 98dd747d864..9ef74ac8b76 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java
@@ -61,11 +61,10 @@ private LoadTPUEmbeddingAdadeltaParameters(Operation operation) {
   public static LoadTPUEmbeddingAdadeltaParameters create(Scope scope, Operand<TFloat32> parameters,
       Operand<TFloat32> accumulators, Operand<TFloat32> updates, Long numShards, Long shardId,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingAdadeltaParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingAdadeltaParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java
index be53836e037..6a8bb70e0aa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java
@@ -62,12 +62,11 @@ private LoadTPUEmbeddingAdadeltaParametersGradAccumDebug(Operation operation) {
   public static LoadTPUEmbeddingAdadeltaParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> accumulators, Operand<TFloat32> updates,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingAdadeltaParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingAdadeltaParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
     opBuilder.addInput(updates.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java
index 95108793139..ec3eb041f92 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java
@@ -59,10 +59,9 @@ private LoadTPUEmbeddingAdagradParameters(Operation operation) {
   )
   public static LoadTPUEmbeddingAdagradParameters create(Scope scope, Operand<TFloat32> parameters,
       Operand<TFloat32> accumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingAdagradParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingAdagradParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java
index 3b995b8cb36..79df9ecd358 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java
@@ -61,11 +61,10 @@ private LoadTPUEmbeddingAdagradParametersGradAccumDebug(Operation operation) {
   public static LoadTPUEmbeddingAdagradParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> accumulators,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingAdagradParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingAdagradParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java
index 9bbac55427b..9d5f01cf52f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java
@@ -62,12 +62,11 @@ private LoadTPUEmbeddingCenteredRMSPropParameters(Operation operation) {
   public static LoadTPUEmbeddingCenteredRMSPropParameters create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> ms, Operand<TFloat32> mom,
       Operand<TFloat32> mg, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingCenteredRMSPropParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingCenteredRMSPropParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(ms.asOutput());
     opBuilder.addInput(mom.asOutput());
     opBuilder.addInput(mg.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java
index ea3aa91041b..9b31d9975fc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java
@@ -61,11 +61,10 @@ private LoadTPUEmbeddingFTRLParameters(Operation operation) {
   public static LoadTPUEmbeddingFTRLParameters create(Scope scope, Operand<TFloat32> parameters,
       Operand<TFloat32> accumulators, Operand<TFloat32> linears, Long numShards, Long shardId,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingFTRLParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingFTRLParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
     opBuilder.addInput(linears.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java
index ea9b4e6b4c3..422515c24a3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java
@@ -62,12 +62,11 @@ private LoadTPUEmbeddingFTRLParametersGradAccumDebug(Operation operation) {
   public static LoadTPUEmbeddingFTRLParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> accumulators, Operand<TFloat32> linears,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingFTRLParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingFTRLParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
     opBuilder.addInput(linears.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java
index f4516f0b19a..328d83e2c87 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java
@@ -62,12 +62,11 @@ private LoadTPUEmbeddingMDLAdagradLightParameters(Operation operation) {
   public static LoadTPUEmbeddingMDLAdagradLightParameters create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> accumulators, Operand<TFloat32> weights,
       Operand<TFloat32> benefits, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingMDLAdagradLightParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingMDLAdagradLightParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
     opBuilder.addInput(weights.asOutput());
     opBuilder.addInput(benefits.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java
index 370d5702a67..2b448ef111d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java
@@ -59,10 +59,9 @@ private LoadTPUEmbeddingMomentumParameters(Operation operation) {
   )
   public static LoadTPUEmbeddingMomentumParameters create(Scope scope, Operand<TFloat32> parameters,
       Operand<TFloat32> momenta, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingMomentumParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingMomentumParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(momenta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java
index 07d265b9bb0..8bfd0dc74eb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java
@@ -61,11 +61,10 @@ private LoadTPUEmbeddingMomentumParametersGradAccumDebug(Operation operation) {
   public static LoadTPUEmbeddingMomentumParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> momenta,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingMomentumParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingMomentumParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(momenta.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java
index 0aff4832087..90bd696b108 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java
@@ -60,10 +60,9 @@ private LoadTPUEmbeddingProximalAdagradParameters(Operation operation) {
   public static LoadTPUEmbeddingProximalAdagradParameters create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> accumulators, Long numShards, Long shardId,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingProximalAdagradParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingProximalAdagradParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java
index 01a15d09e59..7fa88cc5273 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java
@@ -61,11 +61,10 @@ private LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug(Operation operat
   public static LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> accumulators,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(accumulators.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParameters.java
index 40981674d7b..c722394cb64 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParameters.java
@@ -56,11 +56,10 @@ private LoadTPUEmbeddingProximalYogiParameters(Operation operation) {
   public static LoadTPUEmbeddingProximalYogiParameters create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> v, Operand<TFloat32> m, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingProximalYogiParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingProximalYogiParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(v.asOutput());
     opBuilder.addInput(m.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParametersGradAccumDebug.java
index cd9dbf74078..139a4b7928d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParametersGradAccumDebug.java
@@ -57,12 +57,11 @@ private LoadTPUEmbeddingProximalYogiParametersGradAccumDebug(Operation operation
   public static LoadTPUEmbeddingProximalYogiParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> v, Operand<TFloat32> m,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingProximalYogiParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingProximalYogiParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(v.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java
index b3fca976f57..855cd064132 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java
@@ -61,11 +61,10 @@ private LoadTPUEmbeddingRMSPropParameters(Operation operation) {
   public static LoadTPUEmbeddingRMSPropParameters create(Scope scope, Operand<TFloat32> parameters,
       Operand<TFloat32> ms, Operand<TFloat32> mom, Long numShards, Long shardId,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingRMSPropParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingRMSPropParameters");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(ms.asOutput());
     opBuilder.addInput(mom.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java
index 60c13d0163d..3831217f2c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java
@@ -62,12 +62,11 @@ private LoadTPUEmbeddingRMSPropParametersGradAccumDebug(Operation operation) {
   public static LoadTPUEmbeddingRMSPropParametersGradAccumDebug create(Scope scope,
       Operand<TFloat32> parameters, Operand<TFloat32> ms, Operand<TFloat32> mom,
       Operand<TFloat32> gradientAccumulators, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingRMSPropParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingRMSPropParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(ms.asOutput());
     opBuilder.addInput(mom.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java
index 362186da66d..c263af2f921 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java
@@ -58,9 +58,8 @@ private LoadTPUEmbeddingStochasticGradientDescentParameters(Operation operation)
   )
   public static LoadTPUEmbeddingStochasticGradientDescentParameters create(Scope scope,
       Operand<TFloat32> parameters, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingStochasticGradientDescentParameters"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingStochasticGradientDescentParameters");
     opBuilder.addInput(parameters.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java
index e43d7866f75..2b8c8979f43 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java
@@ -60,10 +60,9 @@ private LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug(Operat
   public static LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug create(
       Scope scope, Operand<TFloat32> parameters, Operand<TFloat32> gradientAccumulators,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug");
     opBuilder.addInput(parameters.asOutput());
     opBuilder.addInput(gradientAccumulators.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OrdinalSelector.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OrdinalSelector.java
index e47274b97f5..27ac214d707 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OrdinalSelector.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OrdinalSelector.java
@@ -56,8 +56,7 @@ private OrdinalSelector(Operation operation) {
       describeByClass = true
   )
   public static OrdinalSelector create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrdinalSelector"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OrdinalSelector");
     return new OrdinalSelector(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java
index 691d6030e01..c86acd651b9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java
@@ -63,8 +63,7 @@ private OutfeedDequeue(Operation operation) {
   )
   public static <T extends TType> OutfeedDequeue<T> create(Scope scope, Class<T> dtype, Shape shape,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedDequeue"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OutfeedDequeue");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("shape", shape);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTuple.java
index cfcf0a470d3..317b8c9fe94 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTuple.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTuple.java
@@ -67,8 +67,7 @@ private OutfeedDequeueTuple(Operation operation) {
   )
   public static OutfeedDequeueTuple create(Scope scope, List<Class<? extends TType>> dtypes,
       List<Shape> shapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedDequeueTuple"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OutfeedDequeueTuple");
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     Shape[] shapesArray = new Shape[shapes.size()];
     for (int i = 0 ; i < shapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTupleV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTupleV2.java
index b83a2d2989d..d76cb039bcf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTupleV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTupleV2.java
@@ -71,9 +71,8 @@ private OutfeedDequeueTupleV2(Operation operation) {
   )
   public static OutfeedDequeueTupleV2 create(Scope scope, Operand<TInt32> deviceOrdinal,
       List<Class<? extends TType>> dtypes, List<Shape> shapes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedDequeueTupleV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OutfeedDequeueTupleV2");
     opBuilder.addInput(deviceOrdinal.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     Shape[] shapesArray = new Shape[shapes.size()];
     for (int i = 0 ; i < shapesArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueV2.java
index 71b6be5fa75..52c59042db0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueV2.java
@@ -67,9 +67,8 @@ private OutfeedDequeueV2(Operation operation) {
   )
   public static <T extends TType> OutfeedDequeueV2<T> create(Scope scope,
       Operand<TInt32> deviceOrdinal, Class<T> dtype, Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedDequeueV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OutfeedDequeueV2");
     opBuilder.addInput(deviceOrdinal.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("shape", shape);
     return new OutfeedDequeueV2<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java
index 0563d432c56..91b06a891c3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java
@@ -49,9 +49,8 @@ private OutfeedEnqueue(Operation operation) {
       describeByClass = true
   )
   public static OutfeedEnqueue create(Scope scope, Operand<? extends TType> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedEnqueue"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OutfeedEnqueue");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new OutfeedEnqueue(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueueTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueueTuple.java
index f8cb68f203e..14b280a0e91 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueueTuple.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueueTuple.java
@@ -50,9 +50,8 @@ private OutfeedEnqueueTuple(Operation operation) {
       describeByClass = true
   )
   public static OutfeedEnqueueTuple create(Scope scope, Iterable<Operand<?>> inputs) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedEnqueueTuple"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "OutfeedEnqueueTuple");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     return new OutfeedEnqueueTuple(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedCall.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedCall.java
index a4086db1728..72ea7263328 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedCall.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedCall.java
@@ -69,10 +69,9 @@ private PartitionedCall(Operation operation) {
   public static PartitionedCall create(Scope scope, Iterable<Operand<?>> args,
       Operand<TInt32> deviceOrdinal, List<Class<? extends TType>> Tout, ConcreteFunction f,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PartitionedCall"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PartitionedCall");
     opBuilder.addInputList(Operands.asOutputs(args));
     opBuilder.addInput(deviceOrdinal.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     opBuilder.setAttr("f", f);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedInput.java
index 1ccb4ee19a6..36808e6cf20 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedInput.java
@@ -64,9 +64,8 @@ private PartitionedInput(Operation operation) {
   )
   public static <T extends TType> PartitionedInput<T> create(Scope scope,
       Iterable<Operand<T>> inputs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PartitionedInput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PartitionedInput");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.partitionDim != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedOutput.java
index 425a009730a..55df563614e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedOutput.java
@@ -71,9 +71,8 @@ private PartitionedOutput(Operation operation) {
   )
   public static <T extends TType> PartitionedOutput<T> create(Scope scope, Operand<T> inputs,
       Long numSplits, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PartitionedOutput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PartitionedOutput");
     opBuilder.addInput(inputs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_splits", numSplits);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java
index 70d1fa85507..b88ba6f8fb6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java
@@ -60,9 +60,8 @@ private Prelinearize(Operation operation) {
   )
   public static Prelinearize create(Scope scope, Operand<? extends TType> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Prelinearize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Prelinearize");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.shape != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PrelinearizeTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PrelinearizeTuple.java
index 1d4c3fd6e34..a7683d006e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PrelinearizeTuple.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PrelinearizeTuple.java
@@ -62,9 +62,8 @@ private PrelinearizeTuple(Operation operation) {
   )
   public static PrelinearizeTuple create(Scope scope, Iterable<Operand<?>> inputs,
       List<Shape> shapes, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PrelinearizeTuple"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PrelinearizeTuple");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     Shape[] shapesArray = new Shape[shapes.size()];
     for (int i = 0 ; i < shapesArray.length ; i++) {
       shapesArray[i] = shapes.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RecvTPUEmbeddingActivations.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RecvTPUEmbeddingActivations.java
index 9605e67d8b8..bce36be28ce 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RecvTPUEmbeddingActivations.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RecvTPUEmbeddingActivations.java
@@ -68,8 +68,7 @@ private RecvTPUEmbeddingActivations(Operation operation) {
       describeByClass = true
   )
   public static RecvTPUEmbeddingActivations create(Scope scope, Long numOutputs, String config) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RecvTPUEmbeddingActivations"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RecvTPUEmbeddingActivations");
     opBuilder.setAttr("num_outputs", numOutputs);
     opBuilder.setAttr("config", config);
     return new RecvTPUEmbeddingActivations(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicateMetadata.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicateMetadata.java
index 7f9f50de1da..ea469e87a9f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicateMetadata.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicateMetadata.java
@@ -51,8 +51,7 @@ private ReplicateMetadata(Operation operation) {
       describeByClass = true
   )
   public static ReplicateMetadata create(Scope scope, Long numReplicas, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReplicateMetadata"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReplicateMetadata");
     opBuilder.setAttr("num_replicas", numReplicas);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedInput.java
index 45ef66fe475..609ba0ffea6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedInput.java
@@ -70,9 +70,8 @@ private ReplicatedInput(Operation operation) {
   )
   public static <T extends TType> ReplicatedInput<T> create(Scope scope,
       Iterable<Operand<T>> inputs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReplicatedInput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReplicatedInput");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.isMirroredVariable != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedOutput.java
index 18030fbc955..53c2f484f09 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedOutput.java
@@ -73,9 +73,8 @@ private ReplicatedOutput(Operation operation) {
   )
   public static <T extends TType> ReplicatedOutput<T> create(Scope scope, Operand<T> input,
       Long numReplicas) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReplicatedOutput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReplicatedOutput");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_replicas", numReplicas);
     return new ReplicatedOutput<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParameters.java
index 6ef132a4a6e..2d5b5a035b9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParameters.java
@@ -66,8 +66,7 @@ private RetrieveTPUEmbeddingADAMParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingADAMParameters create(Scope scope, Long numShards, Long shardId,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingADAMParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingADAMParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParametersGradAccumDebug.java
index 6812e2c8a75..b35d58f4620 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParametersGradAccumDebug.java
@@ -69,8 +69,7 @@ private RetrieveTPUEmbeddingADAMParametersGradAccumDebug(Operation operation) {
   )
   public static RetrieveTPUEmbeddingADAMParametersGradAccumDebug create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingADAMParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingADAMParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParameters.java
index 2afc96e2677..bf5c12097f8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParameters.java
@@ -66,8 +66,7 @@ private RetrieveTPUEmbeddingAdadeltaParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingAdadeltaParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingAdadeltaParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingAdadeltaParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug.java
index 1a2bf517d4d..77eeff609e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug.java
@@ -69,8 +69,7 @@ private RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug(Operation operation
   )
   public static RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug create(Scope scope,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParameters.java
index 07f0ce6cc67..259d7301875 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParameters.java
@@ -63,8 +63,7 @@ private RetrieveTPUEmbeddingAdagradParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingAdagradParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingAdagradParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingAdagradParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParametersGradAccumDebug.java
index 71d118edab7..d0c18009b22 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParametersGradAccumDebug.java
@@ -66,8 +66,7 @@ private RetrieveTPUEmbeddingAdagradParametersGradAccumDebug(Operation operation)
   )
   public static RetrieveTPUEmbeddingAdagradParametersGradAccumDebug create(Scope scope,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingAdagradParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingAdagradParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingCenteredRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingCenteredRMSPropParameters.java
index 02054dd4fd6..58c257c4a38 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingCenteredRMSPropParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingCenteredRMSPropParameters.java
@@ -69,8 +69,7 @@ private RetrieveTPUEmbeddingCenteredRMSPropParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingCenteredRMSPropParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingCenteredRMSPropParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingCenteredRMSPropParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParameters.java
index 972f0531eb6..4f8cdfc578c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParameters.java
@@ -66,8 +66,7 @@ private RetrieveTPUEmbeddingFTRLParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingFTRLParameters create(Scope scope, Long numShards, Long shardId,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingFTRLParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingFTRLParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParametersGradAccumDebug.java
index 2b8d87cba31..b2100385e37 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParametersGradAccumDebug.java
@@ -69,8 +69,7 @@ private RetrieveTPUEmbeddingFTRLParametersGradAccumDebug(Operation operation) {
   )
   public static RetrieveTPUEmbeddingFTRLParametersGradAccumDebug create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingFTRLParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingFTRLParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMDLAdagradLightParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMDLAdagradLightParameters.java
index 2909a342468..84f4b4a7da0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMDLAdagradLightParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMDLAdagradLightParameters.java
@@ -69,8 +69,7 @@ private RetrieveTPUEmbeddingMDLAdagradLightParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingMDLAdagradLightParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingMDLAdagradLightParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingMDLAdagradLightParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParameters.java
index f7e9669168c..14c67e9e170 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParameters.java
@@ -63,8 +63,7 @@ private RetrieveTPUEmbeddingMomentumParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingMomentumParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingMomentumParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingMomentumParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParametersGradAccumDebug.java
index bfc04d550a4..c374fb8ecc5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParametersGradAccumDebug.java
@@ -66,8 +66,7 @@ private RetrieveTPUEmbeddingMomentumParametersGradAccumDebug(Operation operation
   )
   public static RetrieveTPUEmbeddingMomentumParametersGradAccumDebug create(Scope scope,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingMomentumParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingMomentumParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParameters.java
index ca4c8a6e2f8..5aea831a41b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParameters.java
@@ -63,8 +63,7 @@ private RetrieveTPUEmbeddingProximalAdagradParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingProximalAdagradParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingProximalAdagradParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingProximalAdagradParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug.java
index 4caa040b0d0..587d0dc3b1d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug.java
@@ -66,8 +66,7 @@ private RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug(Operation op
   )
   public static RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug create(Scope scope,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParameters.java
index b9ae4dfcaf3..26b6a4f0b65 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParameters.java
@@ -62,8 +62,7 @@ private RetrieveTPUEmbeddingProximalYogiParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingProximalYogiParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingProximalYogiParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingProximalYogiParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug.java
index 09e2a534790..6ff27ae7156 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug.java
@@ -65,8 +65,7 @@ private RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug(Operation opera
   )
   public static RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug create(Scope scope,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParameters.java
index ff79ff6fc51..beecf2f21ba 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParameters.java
@@ -66,8 +66,7 @@ private RetrieveTPUEmbeddingRMSPropParameters(Operation operation) {
   )
   public static RetrieveTPUEmbeddingRMSPropParameters create(Scope scope, Long numShards,
       Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingRMSPropParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingRMSPropParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug.java
index 6d7af19a075..569044de7cc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug.java
@@ -69,8 +69,7 @@ private RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug(Operation operation)
   )
   public static RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug create(Scope scope,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParameters.java
index 64d953b3695..f80a04cf0dc 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParameters.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParameters.java
@@ -61,8 +61,7 @@ private RetrieveTPUEmbeddingStochasticGradientDescentParameters(Operation operat
   )
   public static RetrieveTPUEmbeddingStochasticGradientDescentParameters create(Scope scope,
       Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingStochasticGradientDescentParameters"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingStochasticGradientDescentParameters");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java
index ee38afd6690..95d897459b1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java
@@ -64,8 +64,7 @@ private RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug(
   )
   public static RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug create(
       Scope scope, Long numShards, Long shardId, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug");
     opBuilder.setAttr("num_shards", numShards);
     opBuilder.setAttr("shard_id", shardId);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/SendTPUEmbeddingGradients.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/SendTPUEmbeddingGradients.java
index 1c8ba14034d..e9925b25235 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/SendTPUEmbeddingGradients.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/SendTPUEmbeddingGradients.java
@@ -64,10 +64,9 @@ private SendTPUEmbeddingGradients(Operation operation) {
   )
   public static SendTPUEmbeddingGradients create(Scope scope, Iterable<Operand<TFloat32>> inputs,
       Iterable<Operand<TFloat32>> learningRates, String config, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SendTPUEmbeddingGradients"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SendTPUEmbeddingGradients");
     opBuilder.addInputList(Operands.asOutputs(inputs));
     opBuilder.addInputList(Operands.asOutputs(learningRates));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("config", config);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ShutdownDistributedTPU.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ShutdownDistributedTPU.java
index 843e31349b4..75fb90a9caa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ShutdownDistributedTPU.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ShutdownDistributedTPU.java
@@ -47,8 +47,7 @@ private ShutdownDistributedTPU(Operation operation) {
       describeByClass = true
   )
   public static ShutdownDistributedTPU create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShutdownDistributedTPU"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ShutdownDistributedTPU");
     return new ShutdownDistributedTPU(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUCompilationResult.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUCompilationResult.java
index 1d83fb87d7e..7ad97d0b7eb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUCompilationResult.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUCompilationResult.java
@@ -59,8 +59,7 @@ private TPUCompilationResult(Operation operation) {
       describeByClass = true
   )
   public static TPUCompilationResult create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUCompilationResult"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TPUCompilationResult");
     return new TPUCompilationResult(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUEmbeddingActivations.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUEmbeddingActivations.java
index f30c3ecb796..c97dd07cec4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUEmbeddingActivations.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUEmbeddingActivations.java
@@ -68,10 +68,9 @@ private TPUEmbeddingActivations(Operation operation) {
   )
   public static TPUEmbeddingActivations create(Scope scope, Operand<TFloat32> embeddingVariable,
       Operand<TFloat32> slicedActivations, Long tableId, Long lookupId) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUEmbeddingActivations"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TPUEmbeddingActivations");
     opBuilder.addInput(embeddingVariable.asOutput());
     opBuilder.addInput(slicedActivations.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("table_id", tableId);
     opBuilder.setAttr("lookup_id", lookupId);
     return new TPUEmbeddingActivations(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicateMetadata.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicateMetadata.java
index 9baebd25a0b..4a291f3ae50 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicateMetadata.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicateMetadata.java
@@ -54,8 +54,7 @@ private TPUReplicateMetadata(Operation operation) {
       describeByClass = true
   )
   public static TPUReplicateMetadata create(Scope scope, Long numReplicas, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUReplicateMetadata"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TPUReplicateMetadata");
     opBuilder.setAttr("num_replicas", numReplicas);
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedInput.java
index 193aefad52c..de437abaf8e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedInput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedInput.java
@@ -73,9 +73,8 @@ private TPUReplicatedInput(Operation operation) {
   )
   public static <T extends TType> TPUReplicatedInput<T> create(Scope scope,
       Iterable<Operand<T>> inputs, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUReplicatedInput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TPUReplicatedInput");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.isMirroredVariable != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedOutput.java
index 45ded441fa6..33a23fd27e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedOutput.java
@@ -76,9 +76,8 @@ private TPUReplicatedOutput(Operation operation) {
   )
   public static <T extends TType> TPUReplicatedOutput<T> create(Scope scope, Operand<T> input,
       Long numReplicas) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUReplicatedOutput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TPUReplicatedOutput");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("num_replicas", numReplicas);
     return new TPUReplicatedOutput<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReshardVariables.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReshardVariables.java
index 77e2ec5ee98..012917b3350 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReshardVariables.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReshardVariables.java
@@ -59,11 +59,10 @@ private TPUReshardVariables(Operation operation) {
   )
   public static TPUReshardVariables create(Scope scope, Iterable<Operand<? extends TType>> vars,
       Operand<TString> newFormatKey, Operand<? extends TType> formatStateVar) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUReshardVariables"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TPUReshardVariables");
     opBuilder.addInputList(Operands.asOutputs(vars));
     opBuilder.addInput(newFormatKey.asOutput());
     opBuilder.addInput(formatStateVar.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TPUReshardVariables(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/WorkerHeartbeat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/WorkerHeartbeat.java
index 8f5f20fb9bb..76185847723 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/WorkerHeartbeat.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/WorkerHeartbeat.java
@@ -56,9 +56,8 @@ private WorkerHeartbeat(Operation operation) {
       describeByClass = true
   )
   public static WorkerHeartbeat create(Scope scope, Operand<TString> request) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WorkerHeartbeat"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "WorkerHeartbeat");
     opBuilder.addInput(request.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new WorkerHeartbeat(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java
index 9e6e97c2368..204dae5a267 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java
@@ -59,11 +59,10 @@ private AccumulatorApplyGradient(Operation operation) {
   )
   public static AccumulatorApplyGradient create(Scope scope, Operand<TString> handle,
       Operand<TInt64> localStep, Operand<? extends TType> gradient) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulatorApplyGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AccumulatorApplyGradient");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(localStep.asOutput());
     opBuilder.addInput(gradient.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AccumulatorApplyGradient(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorNumAccumulated.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorNumAccumulated.java
index 7eb2131fe46..5b5b775ef9b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorNumAccumulated.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorNumAccumulated.java
@@ -59,9 +59,8 @@ private AccumulatorNumAccumulated(Operation operation) {
       describeByClass = true
   )
   public static AccumulatorNumAccumulated create(Scope scope, Operand<TString> handle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulatorNumAccumulated"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AccumulatorNumAccumulated");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AccumulatorNumAccumulated(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorSetGlobalStep.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorSetGlobalStep.java
index a15cb032c33..cca774e5106 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorSetGlobalStep.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorSetGlobalStep.java
@@ -58,10 +58,9 @@ private AccumulatorSetGlobalStep(Operation operation) {
   )
   public static AccumulatorSetGlobalStep create(Scope scope, Operand<TString> handle,
       Operand<TInt64> newGlobalStep) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulatorSetGlobalStep"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AccumulatorSetGlobalStep");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(newGlobalStep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new AccumulatorSetGlobalStep(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorTakeGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorTakeGradient.java
index 8ef2930e5a6..e27b98bd50b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorTakeGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorTakeGradient.java
@@ -73,10 +73,9 @@ private AccumulatorTakeGradient(Operation operation) {
   )
   public static <T extends TType> AccumulatorTakeGradient<T> create(Scope scope,
       Operand<TString> handle, Operand<TInt32> numRequired, Class<T> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulatorTakeGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "AccumulatorTakeGradient");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(numRequired.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new AccumulatorTakeGradient<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdaMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdaMax.java
index eb480cc02cf..433c44bb92e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdaMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdaMax.java
@@ -71,7 +71,7 @@ private ApplyAdaMax(Operation operation) {
   public static <T extends TType> ApplyAdaMax<T> create(Scope scope, Operand<T> var, Operand<T> m,
       Operand<T> v, Operand<T> beta1Power, Operand<T> lr, Operand<T> beta1, Operand<T> beta2,
       Operand<T> epsilon, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdaMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyAdaMax");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(v.asOutput());
@@ -81,7 +81,6 @@ public static <T extends TType> ApplyAdaMax<T> create(Scope scope, Operand<T> va
     opBuilder.addInput(beta2.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdadelta.java
index 59e1e535f02..f71e57defbd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdadelta.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdadelta.java
@@ -74,7 +74,7 @@ private ApplyAdadelta(Operation operation) {
   public static <T extends TType> ApplyAdadelta<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon,
       Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdadelta"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyAdadelta");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(accumUpdate.asOutput());
@@ -82,7 +82,6 @@ public static <T extends TType> ApplyAdadelta<T> create(Scope scope, Operand<T>
     opBuilder.addInput(rho.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagrad.java
index f300a77b4ac..b26331a94c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagrad.java
@@ -68,12 +68,11 @@ private ApplyAdagrad(Operation operation) {
   )
   public static <T extends TType> ApplyAdagrad<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> lr, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdagrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyAdagrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradDa.java
index 981a2c987e9..978c8db8202 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradDa.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradDa.java
@@ -72,7 +72,7 @@ private ApplyAdagradDa(Operation operation) {
   public static <T extends TType> ApplyAdagradDa<T> create(Scope scope, Operand<T> var,
       Operand<T> gradientAccumulator, Operand<T> gradientSquaredAccumulator, Operand<T> grad,
       Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<TInt64> globalStep, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdagradDa"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyAdagradDa");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(gradientAccumulator.asOutput());
     opBuilder.addInput(gradientSquaredAccumulator.asOutput());
@@ -81,7 +81,6 @@ public static <T extends TType> ApplyAdagradDa<T> create(Scope scope, Operand<T>
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(globalStep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradV2.java
index fb1f1ddd3ec..615802c3be0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradV2.java
@@ -65,13 +65,12 @@ private ApplyAdagradV2(Operation operation) {
   )
   public static <T extends TType> ApplyAdagradV2<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> lr, Operand<T> epsilon, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdagradV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyAdagradV2");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdam.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdam.java
index 79a6e198389..5c47f6dbd56 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdam.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdam.java
@@ -77,7 +77,7 @@ private ApplyAdam(Operation operation) {
   public static <T extends TType> ApplyAdam<T> create(Scope scope, Operand<T> var, Operand<T> m,
       Operand<T> v, Operand<T> beta1Power, Operand<T> beta2Power, Operand<T> lr, Operand<T> beta1,
       Operand<T> beta2, Operand<T> epsilon, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdam"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyAdam");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(v.asOutput());
@@ -88,7 +88,6 @@ public static <T extends TType> ApplyAdam<T> create(Scope scope, Operand<T> var,
     opBuilder.addInput(beta2.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAddSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAddSign.java
index 16c44e61fc0..e0e014d9438 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAddSign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAddSign.java
@@ -73,7 +73,7 @@ private ApplyAddSign(Operation operation) {
   public static <T extends TType> ApplyAddSign<T> create(Scope scope, Operand<T> var, Operand<T> m,
       Operand<T> lr, Operand<T> alpha, Operand<T> signDecay, Operand<T> beta, Operand<T> grad,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAddSign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyAddSign");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(lr.asOutput());
@@ -81,7 +81,6 @@ public static <T extends TType> ApplyAddSign<T> create(Scope scope, Operand<T> v
     opBuilder.addInput(signDecay.asOutput());
     opBuilder.addInput(beta.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyCenteredRmsProp.java
index 56dbb1cd320..015487e6b0f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyCenteredRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyCenteredRmsProp.java
@@ -86,7 +86,7 @@ private ApplyCenteredRmsProp(Operation operation) {
   public static <T extends TType> ApplyCenteredRmsProp<T> create(Scope scope, Operand<T> var,
       Operand<T> mg, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho,
       Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyCenteredRmsProp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyCenteredRmsProp");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(mg.asOutput());
     opBuilder.addInput(ms.asOutput());
@@ -96,7 +96,6 @@ public static <T extends TType> ApplyCenteredRmsProp<T> create(Scope scope, Oper
     opBuilder.addInput(momentum.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyFtrl.java
index 65021524609..2aa8c5146f0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyFtrl.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyFtrl.java
@@ -79,7 +79,7 @@ private ApplyFtrl(Operation operation) {
   public static <T extends TType> ApplyFtrl<T> create(Scope scope, Operand<T> var, Operand<T> accum,
       Operand<T> linear, Operand<T> grad, Operand<T> lr, Operand<T> l1, Operand<T> l2,
       Operand<T> l2Shrinkage, Operand<T> lrPower, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyFtrl"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyFtrl");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(linear.asOutput());
@@ -89,7 +89,6 @@ public static <T extends TType> ApplyFtrl<T> create(Scope scope, Operand<T> var,
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(l2Shrinkage.asOutput());
     opBuilder.addInput(lrPower.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyGradientDescent.java
index 7a39052bd9d..116c546494b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyGradientDescent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyGradientDescent.java
@@ -65,11 +65,10 @@ private ApplyGradientDescent(Operation operation) {
   )
   public static <T extends TType> ApplyGradientDescent<T> create(Scope scope, Operand<T> var,
       Operand<T> alpha, Operand<T> delta, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyGradientDescent"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyGradientDescent");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(alpha.asOutput());
     opBuilder.addInput(delta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyMomentum.java
index b9f2efe52e0..51e5ac6da61 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyMomentum.java
@@ -70,13 +70,12 @@ private ApplyMomentum(Operation operation) {
   )
   public static <T extends TType> ApplyMomentum<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> lr, Operand<T> grad, Operand<T> momentum, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyMomentum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyMomentum");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(momentum.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyPowerSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyPowerSign.java
index a84b790af40..9990db09384 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyPowerSign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyPowerSign.java
@@ -73,7 +73,7 @@ private ApplyPowerSign(Operation operation) {
   public static <T extends TType> ApplyPowerSign<T> create(Scope scope, Operand<T> var,
       Operand<T> m, Operand<T> lr, Operand<T> logbase, Operand<T> signDecay, Operand<T> beta,
       Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyPowerSign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyPowerSign");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(lr.asOutput());
@@ -81,7 +81,6 @@ public static <T extends TType> ApplyPowerSign<T> create(Scope scope, Operand<T>
     opBuilder.addInput(signDecay.asOutput());
     opBuilder.addInput(beta.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalAdagrad.java
index 70707c6787b..713ed8cbdca 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalAdagrad.java
@@ -72,14 +72,13 @@ private ApplyProximalAdagrad(Operation operation) {
   public static <T extends TType> ApplyProximalAdagrad<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> grad,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyProximalAdagrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyProximalAdagrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalGradientDescent.java
index 43f9cdcd622..65cce9b1594 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalGradientDescent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalGradientDescent.java
@@ -70,13 +70,12 @@ private ApplyProximalGradientDescent(Operation operation) {
   public static <T extends TType> ApplyProximalGradientDescent<T> create(Scope scope,
       Operand<T> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> delta,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyProximalGradientDescent"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyProximalGradientDescent");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(alpha.asOutput());
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(delta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyRmsProp.java
index 4646318e109..c64f1a76a37 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyRmsProp.java
@@ -79,7 +79,7 @@ private ApplyRmsProp(Operation operation) {
   public static <T extends TType> ApplyRmsProp<T> create(Scope scope, Operand<T> var, Operand<T> ms,
       Operand<T> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon,
       Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyRmsProp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ApplyRmsProp");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(ms.asOutput());
     opBuilder.addInput(mom.asOutput());
@@ -88,7 +88,6 @@ public static <T extends TType> ApplyRmsProp<T> create(Scope scope, Operand<T> v
     opBuilder.addInput(momentum.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/BatchMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/BatchMatMul.java
index ea1035986e8..0dbe8f569a1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/BatchMatMul.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/BatchMatMul.java
@@ -21,6 +21,7 @@
 import org.tensorflow.Operation;
 import org.tensorflow.OperationBuilder;
 import org.tensorflow.Output;
+import org.tensorflow.op.Operands;
 import org.tensorflow.op.RawOp;
 import org.tensorflow.op.Scope;
 import org.tensorflow.op.annotation.Endpoint;
@@ -50,18 +51,18 @@
  * about broadcasting
  *  <a href="http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html">here</a> .
  *
- * @param <T> data type for {@code output} output
+ * @param <V> data type for {@code output} output
  */
 @Operator(
     group = "train"
 )
-public final class BatchMatMul<T extends TType> extends RawOp implements Operand<T> {
+public final class BatchMatMul<V extends TType> extends RawOp implements Operand<V> {
   /**
    * The name of this op, as known by TensorFlow core engine
    */
-  public static final String OP_NAME = "BatchMatMulV2";
+  public static final String OP_NAME = "BatchMatMulV3";
 
-  private Output<T> output;
+  private Output<V> output;
 
   private BatchMatMul(Operation operation) {
     super(operation);
@@ -70,24 +71,25 @@ private BatchMatMul(Operation operation) {
   }
 
   /**
-   * Factory method to create a class wrapping a new BatchMatMulV2 operation.
+   * Factory method to create a class wrapping a new BatchMatMulV3 operation.
    *
    * @param scope current scope
    * @param x 2-D or higher with shape {@code [..., r_x, c_x]}.
    * @param y 2-D or higher with shape {@code [..., r_y, c_y]}.
+   * @param Tout If not spcified, Tout is the same type to input type.
    * @param options carries optional attribute values
-   * @param <T> data type for {@code BatchMatMulV2} output and operands
+   * @param <V> data type for {@code BatchMatMulV3} output and operands
    * @return a new instance of BatchMatMul
    */
   @Endpoint(
       describeByClass = true
   )
-  public static <T extends TType> BatchMatMul<T> create(Scope scope, Operand<T> x, Operand<T> y,
-      Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatMul"));
+  public static <V extends TType> BatchMatMul<V> create(Scope scope, Operand<? extends TType> x,
+      Operand<? extends TType> y, Class<V> Tout, Options... options) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BatchMatMul");
     opBuilder.addInput(x.asOutput());
     opBuilder.addInput(y.asOutput());
-    opBuilder = scope.apply(opBuilder);
+    opBuilder.setAttr("Tout", Operands.toDataType(Tout));
     if (options != null) {
       for (Options opts : options) {
         if (opts.adjX != null) {
@@ -126,12 +128,12 @@ public static Options adjY(Boolean adjY) {
    * 3-D or higher with shape {@code [..., r_o, c_o]}
    * @return output.
    */
-  public Output<T> output() {
+  public Output<V> output() {
     return output;
   }
 
   @Override
-  public Output<T> asOutput() {
+  public Output<V> asOutput() {
     return output;
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ComputeBatchSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ComputeBatchSize.java
index 1eb33aba66e..707132417e7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ComputeBatchSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ComputeBatchSize.java
@@ -55,9 +55,8 @@ private ComputeBatchSize(Operation operation) {
       describeByClass = true
   )
   public static ComputeBatchSize create(Scope scope, Operand<? extends TType> inputDataset) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ComputeBatchSize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ComputeBatchSize");
     opBuilder.addInput(inputDataset.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ComputeBatchSize(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ConditionalAccumulator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ConditionalAccumulator.java
index c66e06d387b..96449ca58e3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ConditionalAccumulator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ConditionalAccumulator.java
@@ -71,8 +71,7 @@ private ConditionalAccumulator(Operation operation) {
   )
   public static <T extends TType> ConditionalAccumulator create(Scope scope, Class<T> dtype,
       Shape shape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConditionalAccumulator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ConditionalAccumulator");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("shape", shape);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/GenerateVocabRemapping.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/GenerateVocabRemapping.java
index e10213af654..e6797a7111c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/GenerateVocabRemapping.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/GenerateVocabRemapping.java
@@ -92,10 +92,9 @@ private GenerateVocabRemapping(Operation operation) {
   )
   public static GenerateVocabRemapping create(Scope scope, Operand<TString> newVocabFile,
       Operand<TString> oldVocabFile, Long newVocabOffset, Long numNewVocab, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GenerateVocabRemapping"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "GenerateVocabRemapping");
     opBuilder.addInput(newVocabFile.asOutput());
     opBuilder.addInput(oldVocabFile.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("new_vocab_offset", newVocabOffset);
     opBuilder.setAttr("num_new_vocab", numNewVocab);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/MergeV2Checkpoints.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/MergeV2Checkpoints.java
index 68afca884da..9172767def8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/MergeV2Checkpoints.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/MergeV2Checkpoints.java
@@ -63,10 +63,9 @@ private MergeV2Checkpoints(Operation operation) {
   )
   public static MergeV2Checkpoints create(Scope scope, Operand<TString> checkpointPrefixes,
       Operand<TString> destinationPrefix, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MergeV2Checkpoints"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "MergeV2Checkpoints");
     opBuilder.addInput(checkpointPrefixes.asOutput());
     opBuilder.addInput(destinationPrefix.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.deleteOldDirs != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/NegTrain.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/NegTrain.java
index 0581d6a3f90..d41712ac70c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/NegTrain.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/NegTrain.java
@@ -63,13 +63,12 @@ private NegTrain(Operation operation) {
   public static NegTrain create(Scope scope, Operand<TFloat32> wIn, Operand<TFloat32> wOut,
       Operand<TInt32> examples, Operand<TInt32> labels, Operand<TFloat32> lr, List<Long> vocabCount,
       Long numNegativeSamples) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NegTrain"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "NegTrain");
     opBuilder.addInput(wIn.asOutput());
     opBuilder.addInput(wOut.asOutput());
     opBuilder.addInput(examples.asOutput());
     opBuilder.addInput(labels.asOutput());
     opBuilder.addInput(lr.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] vocabCountArray = new long[vocabCount.size()];
     for (int i = 0 ; i < vocabCountArray.length ; i++) {
       vocabCountArray[i] = vocabCount.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/PreventGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/PreventGradient.java
index 89be9949afb..68e248aa696 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/PreventGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/PreventGradient.java
@@ -69,9 +69,8 @@ private PreventGradient(Operation operation) {
   )
   public static <T extends TType> PreventGradient<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PreventGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "PreventGradient");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.message != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java
index fbe5b7be7d4..98f187541c9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java
@@ -55,11 +55,10 @@ private ResourceAccumulatorApplyGradient(Operation operation) {
   public static ResourceAccumulatorApplyGradient create(Scope scope,
       Operand<? extends TType> handle, Operand<TInt64> localStep,
       Operand<? extends TType> gradient) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceAccumulatorApplyGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceAccumulatorApplyGradient");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(localStep.asOutput());
     opBuilder.addInput(gradient.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceAccumulatorApplyGradient(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorNumAccumulated.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorNumAccumulated.java
index 54d8f670440..9041826e913 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorNumAccumulated.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorNumAccumulated.java
@@ -56,9 +56,8 @@ private ResourceAccumulatorNumAccumulated(Operation operation) {
   )
   public static ResourceAccumulatorNumAccumulated create(Scope scope,
       Operand<? extends TType> handle) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceAccumulatorNumAccumulated"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceAccumulatorNumAccumulated");
     opBuilder.addInput(handle.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceAccumulatorNumAccumulated(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorSetGlobalStep.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorSetGlobalStep.java
index 893337bfdb4..b634dca59b8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorSetGlobalStep.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorSetGlobalStep.java
@@ -54,10 +54,9 @@ private ResourceAccumulatorSetGlobalStep(Operation operation) {
   )
   public static ResourceAccumulatorSetGlobalStep create(Scope scope,
       Operand<? extends TType> handle, Operand<TInt64> newGlobalStep) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceAccumulatorSetGlobalStep"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceAccumulatorSetGlobalStep");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(newGlobalStep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ResourceAccumulatorSetGlobalStep(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorTakeGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorTakeGradient.java
index 48901d511ba..867f0751001 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorTakeGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorTakeGradient.java
@@ -68,10 +68,9 @@ private ResourceAccumulatorTakeGradient(Operation operation) {
   )
   public static <T extends TType> ResourceAccumulatorTakeGradient<T> create(Scope scope,
       Operand<? extends TType> handle, Operand<TInt32> numRequired, Class<T> dtype) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceAccumulatorTakeGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceAccumulatorTakeGradient");
     opBuilder.addInput(handle.asOutput());
     opBuilder.addInput(numRequired.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     return new ResourceAccumulatorTakeGradient<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdaMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdaMax.java
index c98a3596b83..fb5947e5ab7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdaMax.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdaMax.java
@@ -65,7 +65,7 @@ public static <T extends TType> ResourceApplyAdaMax create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> m, Operand<? extends TType> v,
       Operand<T> beta1Power, Operand<T> lr, Operand<T> beta1, Operand<T> beta2, Operand<T> epsilon,
       Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdaMax"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyAdaMax");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(v.asOutput());
@@ -75,7 +75,6 @@ public static <T extends TType> ResourceApplyAdaMax create(Scope scope,
     opBuilder.addInput(beta2.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdadelta.java
index 075f4d1dfb2..f7f572719da 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdadelta.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdadelta.java
@@ -68,7 +68,7 @@ public static <T extends TType> ResourceApplyAdadelta create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum,
       Operand<? extends TType> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon,
       Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdadelta"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyAdadelta");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(accumUpdate.asOutput());
@@ -76,7 +76,6 @@ public static <T extends TType> ResourceApplyAdadelta create(Scope scope,
     opBuilder.addInput(rho.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagrad.java
index 74d8df3dd39..ca8682dc2b1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagrad.java
@@ -59,13 +59,12 @@ private ResourceApplyAdagrad(Operation operation) {
   public static <T extends TType> ResourceApplyAdagrad create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr,
       Operand<T> epsilon, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdagrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyAdagrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagradDa.java
index c356bbe4721..5062953430b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagradDa.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagradDa.java
@@ -66,7 +66,7 @@ public static <T extends TType> ResourceApplyAdagradDa create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> gradientAccumulator,
       Operand<? extends TType> gradientSquaredAccumulator, Operand<T> grad, Operand<T> lr,
       Operand<T> l1, Operand<T> l2, Operand<TInt64> globalStep, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdagradDa"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyAdagradDa");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(gradientAccumulator.asOutput());
     opBuilder.addInput(gradientSquaredAccumulator.asOutput());
@@ -75,7 +75,6 @@ public static <T extends TType> ResourceApplyAdagradDa create(Scope scope,
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(globalStep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdam.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdam.java
index 2d11f7de847..eb4d8d0ffd2 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdam.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdam.java
@@ -71,7 +71,7 @@ public static <T extends TType> ResourceApplyAdam create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> m, Operand<? extends TType> v,
       Operand<T> beta1Power, Operand<T> beta2Power, Operand<T> lr, Operand<T> beta1,
       Operand<T> beta2, Operand<T> epsilon, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdam"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyAdam");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(v.asOutput());
@@ -82,7 +82,6 @@ public static <T extends TType> ResourceApplyAdam create(Scope scope,
     opBuilder.addInput(beta2.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdamWithAmsgrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdamWithAmsgrad.java
index 585bd064b24..be9f35d16ea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdamWithAmsgrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdamWithAmsgrad.java
@@ -73,7 +73,7 @@ public static <T extends TType> ResourceApplyAdamWithAmsgrad create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> m, Operand<? extends TType> v,
       Operand<? extends TType> vhat, Operand<T> beta1Power, Operand<T> beta2Power, Operand<T> lr,
       Operand<T> beta1, Operand<T> beta2, Operand<T> epsilon, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdamWithAmsgrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyAdamWithAmsgrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(v.asOutput());
@@ -85,7 +85,6 @@ public static <T extends TType> ResourceApplyAdamWithAmsgrad create(Scope scope,
     opBuilder.addInput(beta2.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAddSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAddSign.java
index 67d32d5ce5c..5a5d2fd2520 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAddSign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAddSign.java
@@ -66,7 +66,7 @@ private ResourceApplyAddSign(Operation operation) {
   public static <T extends TType> ResourceApplyAddSign create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> m, Operand<T> lr, Operand<T> alpha,
       Operand<T> signDecay, Operand<T> beta, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAddSign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyAddSign");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(lr.asOutput());
@@ -74,7 +74,6 @@ public static <T extends TType> ResourceApplyAddSign create(Scope scope,
     opBuilder.addInput(signDecay.asOutput());
     opBuilder.addInput(beta.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyCenteredRmsProp.java
index 80097dad1a0..d10936d4253 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyCenteredRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyCenteredRmsProp.java
@@ -80,7 +80,7 @@ public static <T extends TType> ResourceApplyCenteredRmsProp create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> mg, Operand<? extends TType> ms,
       Operand<? extends TType> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum,
       Operand<T> epsilon, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyCenteredRmsProp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyCenteredRmsProp");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(mg.asOutput());
     opBuilder.addInput(ms.asOutput());
@@ -90,7 +90,6 @@ public static <T extends TType> ResourceApplyCenteredRmsProp create(Scope scope,
     opBuilder.addInput(momentum.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyFtrl.java
index d9c9234275b..d082bbfc45d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyFtrl.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyFtrl.java
@@ -28,8 +28,8 @@
 
 /**
  * Update '*var' according to the Ftrl-proximal scheme.
+ * accum_new = accum + grad * grad
  * grad_with_shrinkage = grad + 2 * l2_shrinkage * var
- * accum_new = accum + grad_with_shrinkage * grad_with_shrinkage
  * linear += grad_with_shrinkage +
  * (accum_new^(-lr_power) - accum^(-lr_power)) / lr * var
  * quadratic = 1.0 / (accum_new^(lr_power) * lr) + 2 * l2
@@ -73,7 +73,7 @@ public static <T extends TType> ResourceApplyFtrl create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<? extends TType> linear,
       Operand<T> grad, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> l2Shrinkage,
       Operand<T> lrPower, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyFtrl"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyFtrl");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(linear.asOutput());
@@ -83,7 +83,6 @@ public static <T extends TType> ResourceApplyFtrl create(Scope scope,
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(l2Shrinkage.asOutput());
     opBuilder.addInput(lrPower.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyGradientDescent.java
index 75ecda0e653..f772d2c6361 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyGradientDescent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyGradientDescent.java
@@ -58,11 +58,10 @@ private ResourceApplyGradientDescent(Operation operation) {
   )
   public static <T extends TType> ResourceApplyGradientDescent create(Scope scope,
       Operand<? extends TType> var, Operand<T> alpha, Operand<T> delta, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyGradientDescent"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyGradientDescent");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(alpha.asOutput());
     opBuilder.addInput(delta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyKerasMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyKerasMomentum.java
index 8047862ad11..bb6a9f3169c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyKerasMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyKerasMomentum.java
@@ -64,13 +64,12 @@ private ResourceApplyKerasMomentum(Operation operation) {
   public static <T extends TType> ResourceApplyKerasMomentum create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr, Operand<T> grad,
       Operand<T> momentum, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyKerasMomentum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyKerasMomentum");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(momentum.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyMomentum.java
index b996a588e1e..f4a9058871a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyMomentum.java
@@ -64,13 +64,12 @@ private ResourceApplyMomentum(Operation operation) {
   public static <T extends TType> ResourceApplyMomentum create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr, Operand<T> grad,
       Operand<T> momentum, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyMomentum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyMomentum");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(momentum.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyPowerSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyPowerSign.java
index 54eed271806..397de82bac3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyPowerSign.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyPowerSign.java
@@ -66,7 +66,7 @@ private ResourceApplyPowerSign(Operation operation) {
   public static <T extends TType> ResourceApplyPowerSign create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> m, Operand<T> lr, Operand<T> logbase,
       Operand<T> signDecay, Operand<T> beta, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyPowerSign"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyPowerSign");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(m.asOutput());
     opBuilder.addInput(lr.asOutput());
@@ -74,7 +74,6 @@ public static <T extends TType> ResourceApplyPowerSign create(Scope scope,
     opBuilder.addInput(signDecay.asOutput());
     opBuilder.addInput(beta.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalAdagrad.java
index 35aca767c42..177ee0b4ec7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalAdagrad.java
@@ -65,14 +65,13 @@ private ResourceApplyProximalAdagrad(Operation operation) {
   public static <T extends TType> ResourceApplyProximalAdagrad create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr, Operand<T> l1,
       Operand<T> l2, Operand<T> grad, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyProximalAdagrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyProximalAdagrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalGradientDescent.java
index b3dfa606bb3..4dd1fc9a361 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalGradientDescent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalGradientDescent.java
@@ -63,13 +63,12 @@ private ResourceApplyProximalGradientDescent(Operation operation) {
   public static <T extends TType> ResourceApplyProximalGradientDescent create(Scope scope,
       Operand<? extends TType> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2,
       Operand<T> delta, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyProximalGradientDescent"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyProximalGradientDescent");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(alpha.asOutput());
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(delta.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyRmsProp.java
index af8279533aa..c6b569388ed 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyRmsProp.java
@@ -73,7 +73,7 @@ public static <T extends TType> ResourceApplyRmsProp create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> ms, Operand<? extends TType> mom,
       Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyRmsProp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceApplyRmsProp");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(ms.asOutput());
     opBuilder.addInput(mom.asOutput());
@@ -82,7 +82,6 @@ public static <T extends TType> ResourceApplyRmsProp create(Scope scope,
     opBuilder.addInput(momentum.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceConditionalAccumulator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceConditionalAccumulator.java
index 4c9bbc9249c..546a566f45a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceConditionalAccumulator.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceConditionalAccumulator.java
@@ -69,8 +69,7 @@ private ResourceConditionalAccumulator(Operation operation) {
   )
   public static <T extends TType> ResourceConditionalAccumulator create(Scope scope, Class<T> dtype,
       Shape shape, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceConditionalAccumulator"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceConditionalAccumulator");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("shape", shape);
     if (options != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java
index 3c8b09cb025..816e18737ca 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java
@@ -66,7 +66,7 @@ public static <T extends TType> ResourceSparseApplyAdadelta create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum,
       Operand<? extends TType> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon,
       Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyAdadelta"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyAdadelta");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(accumUpdate.asOutput());
@@ -75,7 +75,6 @@ public static <T extends TType> ResourceSparseApplyAdadelta create(Scope scope,
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java
index 321aeab094b..733fc1f3f6b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java
@@ -65,13 +65,12 @@ private ResourceSparseApplyAdagrad(Operation operation) {
   public static <T extends TType> ResourceSparseApplyAdagrad create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr, Operand<T> grad,
       Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyAdagrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyAdagrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java
index 39363dfe817..d2c3ea597e8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java
@@ -69,7 +69,7 @@ public static <T extends TType> ResourceSparseApplyAdagradDa create(Scope scope,
       Operand<? extends TType> gradientSquaredAccumulator, Operand<T> grad,
       Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2,
       Operand<TInt64> globalStep, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyAdagradDa"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyAdagradDa");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(gradientAccumulator.asOutput());
     opBuilder.addInput(gradientSquaredAccumulator.asOutput());
@@ -79,7 +79,6 @@ public static <T extends TType> ResourceSparseApplyAdagradDa create(Scope scope,
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(globalStep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java
index 5ab7b56ae68..a432cee80f3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java
@@ -62,14 +62,13 @@ private ResourceSparseApplyAdagradV2(Operation operation) {
   public static <T extends TType> ResourceSparseApplyAdagradV2 create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr,
       Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyAdagradV2"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyAdagradV2");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java
index edc5d692e0c..4a39342989e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java
@@ -81,7 +81,7 @@ public static <T extends TType> ResourceSparseApplyCenteredRmsProp create(Scope
       Operand<? extends TType> var, Operand<? extends TType> mg, Operand<? extends TType> ms,
       Operand<? extends TType> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum,
       Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyCenteredRmsProp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyCenteredRmsProp");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(mg.asOutput());
     opBuilder.addInput(ms.asOutput());
@@ -92,7 +92,6 @@ public static <T extends TType> ResourceSparseApplyCenteredRmsProp create(Scope
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java
index 1193b2dab3c..d4ff9eceb67 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java
@@ -76,7 +76,7 @@ public static <T extends TType> ResourceSparseApplyFtrl create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<? extends TType> linear,
       Operand<T> grad, Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1,
       Operand<T> l2, Operand<T> l2Shrinkage, Operand<T> lrPower, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyFtrl"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyFtrl");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(linear.asOutput());
@@ -87,7 +87,6 @@ public static <T extends TType> ResourceSparseApplyFtrl create(Scope scope,
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(l2Shrinkage.asOutput());
     opBuilder.addInput(lrPower.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java
index a4559f906bc..3359aeb3d8f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java
@@ -67,14 +67,13 @@ private ResourceSparseApplyKerasMomentum(Operation operation) {
   public static <T extends TType> ResourceSparseApplyKerasMomentum create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr, Operand<T> grad,
       Operand<? extends TNumber> indices, Operand<T> momentum, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyKerasMomentum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyKerasMomentum");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(momentum.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java
index 29805679b05..37a53ca5174 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java
@@ -67,14 +67,13 @@ private ResourceSparseApplyMomentum(Operation operation) {
   public static <T extends TType> ResourceSparseApplyMomentum create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr, Operand<T> grad,
       Operand<? extends TNumber> indices, Operand<T> momentum, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyMomentum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyMomentum");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(momentum.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java
index 5f1fd5b5969..9beeb9b81d7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java
@@ -69,7 +69,7 @@ private ResourceSparseApplyProximalAdagrad(Operation operation) {
   public static <T extends TType> ResourceSparseApplyProximalAdagrad create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> accum, Operand<T> lr, Operand<T> l1,
       Operand<T> l2, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyProximalAdagrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyProximalAdagrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
@@ -77,7 +77,6 @@ public static <T extends TType> ResourceSparseApplyProximalAdagrad create(Scope
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java
index 59c7f23f814..d7d2f5b85d1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java
@@ -66,14 +66,13 @@ private ResourceSparseApplyProximalGradientDescent(Operation operation) {
   public static <T extends TType> ResourceSparseApplyProximalGradientDescent create(Scope scope,
       Operand<? extends TType> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> grad,
       Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyProximalGradientDescent"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyProximalGradientDescent");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(alpha.asOutput());
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java
index ce8cd1552f6..0ff4e6f9003 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java
@@ -75,7 +75,7 @@ public static <T extends TType> ResourceSparseApplyRmsProp create(Scope scope,
       Operand<? extends TType> var, Operand<? extends TType> ms, Operand<? extends TType> mom,
       Operand<T> lr, Operand<T> rho, Operand<T> momentum, Operand<T> epsilon, Operand<T> grad,
       Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyRmsProp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ResourceSparseApplyRmsProp");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(ms.asOutput());
     opBuilder.addInput(mom.asOutput());
@@ -85,7 +85,6 @@ public static <T extends TType> ResourceSparseApplyRmsProp create(Scope scope,
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Restore.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Restore.java
index d08a97c9f7b..40dd24048f0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Restore.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Restore.java
@@ -85,11 +85,10 @@ private Restore(Operation operation) {
   )
   public static Restore create(Scope scope, Operand<TString> prefix, Operand<TString> tensorNames,
       Operand<TString> shapeAndSlices, List<Class<? extends TType>> dtypes) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Restore"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Restore");
     opBuilder.addInput(prefix.asOutput());
     opBuilder.addInput(tensorNames.asOutput());
     opBuilder.addInput(shapeAndSlices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes));
     return new Restore(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/RestoreSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/RestoreSlice.java
index 75fad7a8d67..4bcd181e5f3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/RestoreSlice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/RestoreSlice.java
@@ -77,11 +77,10 @@ private RestoreSlice(Operation operation) {
   public static <T extends TType> RestoreSlice<T> create(Scope scope, Operand<TString> filePattern,
       Operand<TString> tensorName, Operand<TString> shapeAndSlice, Class<T> dt,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RestoreSlice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RestoreSlice");
     opBuilder.addInput(filePattern.asOutput());
     opBuilder.addInput(tensorName.asOutput());
     opBuilder.addInput(shapeAndSlice.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dt", Operands.toDataType(dt));
     if (options != null) {
       for (Options opts : options) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Save.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Save.java
index 377803d42dd..722c88f3eaa 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Save.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Save.java
@@ -63,12 +63,11 @@ private Save(Operation operation) {
   )
   public static Save create(Scope scope, Operand<TString> prefix, Operand<TString> tensorNames,
       Operand<TString> shapeAndSlices, Iterable<Operand<?>> tensors) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Save"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Save");
     opBuilder.addInput(prefix.asOutput());
     opBuilder.addInput(tensorNames.asOutput());
     opBuilder.addInput(shapeAndSlices.asOutput());
     opBuilder.addInputList(Operands.asOutputs(tensors));
-    opBuilder = scope.apply(opBuilder);
     return new Save(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SaveSlices.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SaveSlices.java
index 47155cdfafc..50223df730d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SaveSlices.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SaveSlices.java
@@ -80,12 +80,11 @@ private SaveSlices(Operation operation) {
   )
   public static SaveSlices create(Scope scope, Operand<TString> filename,
       Operand<TString> tensorNames, Operand<TString> shapesAndSlices, Iterable<Operand<?>> data) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SaveSlices"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SaveSlices");
     opBuilder.addInput(filename.asOutput());
     opBuilder.addInput(tensorNames.asOutput());
     opBuilder.addInput(shapesAndSlices.asOutput());
     opBuilder.addInputList(Operands.asOutputs(data));
-    opBuilder = scope.apply(opBuilder);
     return new SaveSlices(opBuilder.build());
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaFprint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaFprint.java
index a0e4b452faa..fb20638e575 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaFprint.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaFprint.java
@@ -59,9 +59,8 @@ private SdcaFprint(Operation operation) {
       describeByClass = true
   )
   public static SdcaFprint create(Scope scope, Operand<TString> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SdcaFprint"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SdcaFprint");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SdcaFprint(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaOptimizer.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaOptimizer.java
index 45f17fe0497..d8273b2b40d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaOptimizer.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaOptimizer.java
@@ -111,7 +111,7 @@ public static SdcaOptimizer create(Scope scope, Iterable<Operand<TInt64>> sparse
       Iterable<Operand<TInt64>> sparseIndices, Iterable<Operand<TFloat32>> sparseWeights,
       Iterable<Operand<TFloat32>> denseWeights, Operand<TFloat32> exampleStateData, String lossType,
       Float l1, Float l2, Long numLossPartitions, Long numInnerIterations, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SdcaOptimizer"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SdcaOptimizer");
     opBuilder.addInputList(Operands.asOutputs(sparseExampleIndices));
     opBuilder.addInputList(Operands.asOutputs(sparseFeatureIndices));
     opBuilder.addInputList(Operands.asOutputs(sparseFeatureValues));
@@ -122,7 +122,6 @@ public static SdcaOptimizer create(Scope scope, Iterable<Operand<TInt64>> sparse
     opBuilder.addInputList(Operands.asOutputs(sparseWeights));
     opBuilder.addInputList(Operands.asOutputs(denseWeights));
     opBuilder.addInput(exampleStateData.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("loss_type", lossType);
     opBuilder.setAttr("l1", l1);
     opBuilder.setAttr("l2", l2);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaShrinkL1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaShrinkL1.java
index 1c68ed4e07c..5c30c4197ac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaShrinkL1.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaShrinkL1.java
@@ -58,9 +58,8 @@ private SdcaShrinkL1(Operation operation) {
   )
   public static SdcaShrinkL1 create(Scope scope, Iterable<Operand<TFloat32>> weights, Float l1,
       Float l2) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SdcaShrinkL1"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SdcaShrinkL1");
     opBuilder.addInputList(Operands.asOutputs(weights));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("l1", l1);
     opBuilder.setAttr("l2", l2);
     return new SdcaShrinkL1(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java
index 0102cfcb1d6..067291732f4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java
@@ -72,7 +72,7 @@ private SparseApplyAdadelta(Operation operation) {
   public static <T extends TType> SparseApplyAdadelta<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> accumUpdate, Operand<T> lr, Operand<T> rho, Operand<T> epsilon,
       Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyAdadelta"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyAdadelta");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(accumUpdate.asOutput());
@@ -81,7 +81,6 @@ public static <T extends TType> SparseApplyAdadelta<T> create(Scope scope, Opera
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java
index 3b38f3694a7..871e70cec9d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java
@@ -69,14 +69,13 @@ private SparseApplyAdagrad(Operation operation) {
   public static <T extends TType> SparseApplyAdagrad<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> lr, Operand<T> epsilon, Operand<T> grad,
       Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyAdagrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyAdagrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java
index 89b5a446e78..f54420becc3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java
@@ -75,7 +75,7 @@ public static <T extends TType> SparseApplyAdagradDa<T> create(Scope scope, Oper
       Operand<T> gradientAccumulator, Operand<T> gradientSquaredAccumulator, Operand<T> grad,
       Operand<? extends TNumber> indices, Operand<T> lr, Operand<T> l1, Operand<T> l2,
       Operand<TInt64> globalStep, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyAdagradDa"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyAdagradDa");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(gradientAccumulator.asOutput());
     opBuilder.addInput(gradientSquaredAccumulator.asOutput());
@@ -85,7 +85,6 @@ public static <T extends TType> SparseApplyAdagradDa<T> create(Scope scope, Oper
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(globalStep.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java
index 15c6d62c956..931e987a908 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java
@@ -88,7 +88,7 @@ public static <T extends TType> SparseApplyCenteredRmsProp<T> create(Scope scope
       Operand<T> mg, Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho,
       Operand<T> momentum, Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyCenteredRmsProp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyCenteredRmsProp");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(mg.asOutput());
     opBuilder.addInput(ms.asOutput());
@@ -99,7 +99,6 @@ public static <T extends TType> SparseApplyCenteredRmsProp<T> create(Scope scope
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java
index 165e3ac72dd..780d36208ff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java
@@ -83,7 +83,7 @@ public static <T extends TType> SparseApplyFtrl<T> create(Scope scope, Operand<T
       Operand<T> accum, Operand<T> linear, Operand<T> grad, Operand<? extends TNumber> indices,
       Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> l2Shrinkage, Operand<T> lrPower,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyFtrl"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyFtrl");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(linear.asOutput());
@@ -94,7 +94,6 @@ public static <T extends TType> SparseApplyFtrl<T> create(Scope scope, Operand<T
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(l2Shrinkage.asOutput());
     opBuilder.addInput(lrPower.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java
index 5abaf6bd277..dc6cd3beee5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java
@@ -74,14 +74,13 @@ private SparseApplyMomentum(Operation operation) {
   public static <T extends TType> SparseApplyMomentum<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> lr, Operand<T> grad, Operand<? extends TNumber> indices,
       Operand<T> momentum, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyMomentum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyMomentum");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
     opBuilder.addInput(momentum.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java
index 4cb6d7ce765..68f56702597 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java
@@ -76,7 +76,7 @@ private SparseApplyProximalAdagrad(Operation operation) {
   public static <T extends TType> SparseApplyProximalAdagrad<T> create(Scope scope, Operand<T> var,
       Operand<T> accum, Operand<T> lr, Operand<T> l1, Operand<T> l2, Operand<T> grad,
       Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyProximalAdagrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyProximalAdagrad");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(accum.asOutput());
     opBuilder.addInput(lr.asOutput());
@@ -84,7 +84,6 @@ public static <T extends TType> SparseApplyProximalAdagrad<T> create(Scope scope
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java
index 2086701eb0c..cae253e1891 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java
@@ -73,14 +73,13 @@ private SparseApplyProximalGradientDescent(Operation operation) {
   public static <T extends TType> SparseApplyProximalGradientDescent<T> create(Scope scope,
       Operand<T> var, Operand<T> alpha, Operand<T> l1, Operand<T> l2, Operand<T> grad,
       Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyProximalGradientDescent"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyProximalGradientDescent");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(alpha.asOutput());
     opBuilder.addInput(l1.asOutput());
     opBuilder.addInput(l2.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java
index 717e40da997..5e1fc582838 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java
@@ -81,7 +81,7 @@ private SparseApplyRmsProp(Operation operation) {
   public static <T extends TType> SparseApplyRmsProp<T> create(Scope scope, Operand<T> var,
       Operand<T> ms, Operand<T> mom, Operand<T> lr, Operand<T> rho, Operand<T> momentum,
       Operand<T> epsilon, Operand<T> grad, Operand<? extends TNumber> indices, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyRmsProp"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SparseApplyRmsProp");
     opBuilder.addInput(var.asOutput());
     opBuilder.addInput(ms.asOutput());
     opBuilder.addInput(mom.asOutput());
@@ -91,7 +91,6 @@ public static <T extends TType> SparseApplyRmsProp<T> create(Scope scope, Operan
     opBuilder.addInput(epsilon.asOutput());
     opBuilder.addInput(grad.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.useLocking != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SymbolicGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SymbolicGradient.java
index e58ce0b2afb..0bd82ac6525 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SymbolicGradient.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SymbolicGradient.java
@@ -82,9 +82,8 @@ private SymbolicGradient(Operation operation) {
   )
   public static SymbolicGradient create(Scope scope, Iterable<Operand<?>> input,
       List<Class<? extends TType>> Tout, ConcreteFunction f) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SymbolicGradient"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SymbolicGradient");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
     opBuilder.setAttr("f", f);
     return new SymbolicGradient(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/TileGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/TileGrad.java
index 4c1370d811b..9c18ef0054f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/TileGrad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/TileGrad.java
@@ -67,10 +67,9 @@ private TileGrad(Operation operation) {
   )
   public static <T extends TType> TileGrad<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> multiples) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TileGrad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "TileGrad");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(multiples.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new TileGrad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java
index 353db60eb03..d32efe74374 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java
@@ -71,11 +71,10 @@ private BroadcastHelper(Operation operation) {
   )
   public static <T extends TType> BroadcastHelper<T> create(Scope scope, Operand<T> lhs,
       Operand<T> rhs, Operand<? extends TNumber> broadcastDims) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastHelper"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "BroadcastHelper");
     opBuilder.addInput(lhs.asOutput());
     opBuilder.addInput(rhs.asOutput());
     opBuilder.addInput(broadcastDims.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new BroadcastHelper<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ClusterOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ClusterOutput.java
index b2dcd06538d..4f316783fd9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ClusterOutput.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ClusterOutput.java
@@ -61,9 +61,8 @@ private ClusterOutput(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> ClusterOutput<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ClusterOutput"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ClusterOutput");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new ClusterOutput<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Conv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Conv.java
index fc238e7ebc5..3ff4fc14d66 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Conv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Conv.java
@@ -79,7 +79,7 @@ public static <W extends TType, V extends TNumber> Conv<W> create(Scope scope,
       Operand<V> padding, Operand<V> lhsDilation, Operand<V> rhsDilation,
       Operand<V> featureGroupCount, String dimensionNumbers, String precisionConfig,
       Class<W> preferredElementType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Conv");
     opBuilder.addInput(lhs.asOutput());
     opBuilder.addInput(rhs.asOutput());
     opBuilder.addInput(windowStrides.asOutput());
@@ -87,7 +87,6 @@ public static <W extends TType, V extends TNumber> Conv<W> create(Scope scope,
     opBuilder.addInput(lhsDilation.asOutput());
     opBuilder.addInput(rhsDilation.asOutput());
     opBuilder.addInput(featureGroupCount.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dimension_numbers", dimensionNumbers);
     opBuilder.setAttr("precision_config", precisionConfig);
     opBuilder.setAttr("preferred_element_type", Operands.toDataType(preferredElementType));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dequantize.java
index 6ced962c063..40fb4ee2ecd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dequantize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dequantize.java
@@ -66,9 +66,8 @@ private Dequantize(Operation operation) {
   )
   public static Dequantize create(Scope scope, Operand<? extends TType> input, Float minRange,
       Float maxRange, String mode, Boolean transposeOutput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dequantize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Dequantize");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("min_range", minRange);
     opBuilder.setAttr("max_range", maxRange);
     opBuilder.setAttr("mode", mode);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dot.java
index 420ad933a2b..86253843b77 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dot.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dot.java
@@ -70,10 +70,9 @@ private Dot(Operation operation) {
   public static <V extends TType> Dot<V> create(Scope scope, Operand<? extends TType> lhs,
       Operand<? extends TType> rhs, String dimensionNumbers, String precisionConfig,
       Class<V> preferredElementType) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dot"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Dot");
     opBuilder.addInput(lhs.asOutput());
     opBuilder.addInput(rhs.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dimension_numbers", dimensionNumbers);
     opBuilder.setAttr("precision_config", precisionConfig);
     opBuilder.setAttr("preferred_element_type", Operands.toDataType(preferredElementType));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicSlice.java
index 52b632adcff..93d22721098 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicSlice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicSlice.java
@@ -76,11 +76,10 @@ private DynamicSlice(Operation operation) {
   )
   public static <T extends TType, U extends TNumber> DynamicSlice<T> create(Scope scope,
       Operand<T> input, Operand<U> startIndices, Operand<U> sizeIndices) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DynamicSlice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DynamicSlice");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(startIndices.asOutput());
     opBuilder.addInput(sizeIndices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DynamicSlice<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java
index 7beece641f8..0355ff82f53 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java
@@ -73,11 +73,10 @@ private DynamicUpdateSlice(Operation operation) {
   )
   public static <T extends TType> DynamicUpdateSlice<T> create(Scope scope, Operand<T> input,
       Operand<T> update, Operand<? extends TNumber> indices) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DynamicUpdateSlice"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "DynamicUpdateSlice");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(update.asOutput());
     opBuilder.addInput(indices.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new DynamicUpdateSlice<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Einsum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Einsum.java
index b9f68a068f8..304d7a3889b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Einsum.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Einsum.java
@@ -66,10 +66,9 @@ private Einsum(Operation operation) {
   )
   public static <T extends TType> Einsum<T> create(Scope scope, Operand<T> a, Operand<T> b,
       String equation) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Einsum"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Einsum");
     opBuilder.addInput(a.asOutput());
     opBuilder.addInput(b.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("equation", equation);
     return new Einsum<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Gather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Gather.java
index 152020b8b01..e24dc9531ad 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Gather.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Gather.java
@@ -70,11 +70,10 @@ private Gather(Operation operation) {
   public static <T extends TType, U extends TNumber> Gather<T> create(Scope scope,
       Operand<T> operand, Operand<U> startIndices, Operand<U> sliceSizes, String dimensionNumbers,
       Boolean indicesAreSorted) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Gather"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Gather");
     opBuilder.addInput(operand.asOutput());
     opBuilder.addInput(startIndices.asOutput());
     opBuilder.addInput(sliceSizes.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("dimension_numbers", dimensionNumbers);
     opBuilder.setAttr("indices_are_sorted", indicesAreSorted);
     return new Gather<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/If.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/If.java
index c0bc7d5001b..f12401bc398 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/If.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/If.java
@@ -74,10 +74,9 @@ private If(Operation operation) {
   )
   public static If create(Scope scope, Operand<? extends TType> cond, Iterable<Operand<?>> inputs,
       ConcreteFunction thenBranch, ConcreteFunction elseBranch, List<Class<? extends TType>> Tout) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("If"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "If");
     opBuilder.addInput(cond.asOutput());
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("then_branch", thenBranch);
     opBuilder.setAttr("else_branch", elseBranch);
     opBuilder.setAttr("Tout", Operands.toDataTypes(Tout));
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/KeyValueSort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/KeyValueSort.java
index a6572ae3b5e..c2e896d70f8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/KeyValueSort.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/KeyValueSort.java
@@ -73,10 +73,9 @@ private KeyValueSort(Operation operation) {
   )
   public static <T extends TNumber, U extends TType> KeyValueSort<T, U> create(Scope scope,
       Operand<T> keys, Operand<U> values) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("KeyValueSort"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "KeyValueSort");
     opBuilder.addInput(keys.asOutput());
     opBuilder.addInput(values.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new KeyValueSort<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Pad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Pad.java
index f0122134568..ef323534772 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Pad.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Pad.java
@@ -75,13 +75,12 @@ private Pad(Operation operation) {
   public static <T extends TType, U extends TNumber> Pad<T> create(Scope scope, Operand<T> input,
       Operand<T> paddingValue, Operand<U> paddingLow, Operand<U> paddingHigh,
       Operand<U> paddingInterior) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Pad"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Pad");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(paddingValue.asOutput());
     opBuilder.addInput(paddingLow.asOutput());
     opBuilder.addInput(paddingHigh.asOutput());
     opBuilder.addInput(paddingInterior.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Pad<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Recv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Recv.java
index c81c6994186..a66c8d99037 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Recv.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Recv.java
@@ -68,8 +68,7 @@ private Recv(Operation operation) {
   )
   public static <T extends TType> Recv<T> create(Scope scope, Class<T> dtype, String tensorName,
       Shape shape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Recv"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Recv");
     opBuilder.setAttr("dtype", Operands.toDataType(dtype));
     opBuilder.setAttr("tensor_name", tensorName);
     opBuilder.setAttr("shape", shape);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Reduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Reduce.java
index ec39d1def2c..2f96544c034 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Reduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Reduce.java
@@ -68,10 +68,9 @@ private Reduce(Operation operation) {
   )
   public static <T extends TType> Reduce<T> create(Scope scope, Operand<T> input,
       Operand<T> initValue, List<Long> dimensionsToReduce, ConcreteFunction reducer) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Reduce");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(initValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     long[] dimensionsToReduceArray = new long[dimensionsToReduce.size()];
     for (int i = 0 ; i < dimensionsToReduceArray.length ; i++) {
       dimensionsToReduceArray[i] = dimensionsToReduce.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReduceWindow.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReduceWindow.java
index 7e2a4eaf100..a644b94382c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReduceWindow.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReduceWindow.java
@@ -75,7 +75,7 @@ public static <T extends TType, U extends TNumber> ReduceWindow<T> create(Scope
       Operand<T> input, Operand<T> initValue, Operand<U> windowDimensions, Operand<U> windowStrides,
       Operand<U> baseDilations, Operand<U> windowDilations, Operand<U> padding,
       ConcreteFunction computation) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceWindow"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReduceWindow");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(initValue.asOutput());
     opBuilder.addInput(windowDimensions.asOutput());
@@ -83,7 +83,6 @@ public static <T extends TType, U extends TNumber> ReduceWindow<T> create(Scope
     opBuilder.addInput(baseDilations.asOutput());
     opBuilder.addInput(windowDilations.asOutput());
     opBuilder.addInput(padding.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("computation", computation);
     return new ReduceWindow<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/RemoveDynamicDimensionSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/RemoveDynamicDimensionSize.java
new file mode 100644
index 00000000000..2aa9d0b3b48
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/RemoveDynamicDimensionSize.java
@@ -0,0 +1,90 @@
+/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================*/
+
+// This class has been generated, DO NOT EDIT!
+
+package org.tensorflow.op.xla;
+
+import org.tensorflow.Operand;
+import org.tensorflow.Operation;
+import org.tensorflow.OperationBuilder;
+import org.tensorflow.Output;
+import org.tensorflow.op.RawOp;
+import org.tensorflow.op.Scope;
+import org.tensorflow.op.annotation.Endpoint;
+import org.tensorflow.op.annotation.Operator;
+import org.tensorflow.types.TInt32;
+import org.tensorflow.types.family.TType;
+
+/**
+ * Inverse of XlaSetDynamicDimensionSize. Make an xla bounded
+ * <pre>
+ *     dynamic dimension into a static dimension. The bound of the size of
+ *     dimension `dim_index` becomes the static dimension size.
+ * </pre>
+ *
+ * @param <T> data type for {@code output} output
+ */
+@Operator(
+    group = "xla"
+)
+public final class RemoveDynamicDimensionSize<T extends TType> extends RawOp implements Operand<T> {
+  /**
+   * The name of this op, as known by TensorFlow core engine
+   */
+  public static final String OP_NAME = "XlaRemoveDynamicDimensionSize";
+
+  private Output<T> output;
+
+  private RemoveDynamicDimensionSize(Operation operation) {
+    super(operation);
+    int outputIdx = 0;
+    output = operation.output(outputIdx++);
+  }
+
+  /**
+   * Factory method to create a class wrapping a new XlaRemoveDynamicDimensionSize operation.
+   *
+   * @param scope current scope
+   * @param input the input value
+   * @param dimIndex the dimIndex value
+   * @param <T> data type for {@code XlaRemoveDynamicDimensionSize} output and operands
+   * @return a new instance of RemoveDynamicDimensionSize
+   */
+  @Endpoint(
+      describeByClass = true
+  )
+  public static <T extends TType> RemoveDynamicDimensionSize<T> create(Scope scope,
+      Operand<T> input, Operand<TInt32> dimIndex) {
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "RemoveDynamicDimensionSize");
+    opBuilder.addInput(input.asOutput());
+    opBuilder.addInput(dimIndex.asOutput());
+    return new RemoveDynamicDimensionSize<>(opBuilder.build());
+  }
+
+  /**
+   * Gets output.
+   *
+   * @return output.
+   */
+  public Output<T> output() {
+    return output;
+  }
+
+  @Override
+  public Output<T> asOutput() {
+    return output;
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReplicaId.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReplicaId.java
index 7b990fd7c3b..d6a886ea393 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReplicaId.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReplicaId.java
@@ -57,8 +57,7 @@ private ReplicaId(Operation operation) {
       describeByClass = true
   )
   public static ReplicaId create(Scope scope) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReplicaId"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "ReplicaId");
     return new ReplicaId(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Scatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Scatter.java
index 9a249b0e862..36f7e495841 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Scatter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Scatter.java
@@ -73,11 +73,10 @@ private Scatter(Operation operation) {
   public static <T extends TType> Scatter<T> create(Scope scope, Operand<T> operand,
       Operand<? extends TNumber> scatterIndices, Operand<T> updates,
       ConcreteFunction updateComputation, String dimensionNumbers, Boolean indicesAreSorted) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Scatter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Scatter");
     opBuilder.addInput(operand.asOutput());
     opBuilder.addInput(scatterIndices.asOutput());
     opBuilder.addInput(updates.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("update_computation", updateComputation);
     opBuilder.setAttr("dimension_numbers", dimensionNumbers);
     opBuilder.setAttr("indices_are_sorted", indicesAreSorted);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelectAndScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelectAndScatter.java
index 4e3b9753f96..8da8b04a540 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelectAndScatter.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelectAndScatter.java
@@ -75,14 +75,13 @@ private SelectAndScatter(Operation operation) {
   public static <T extends TType, U extends TNumber> SelectAndScatter<T> create(Scope scope,
       Operand<T> operand, Operand<U> windowDimensions, Operand<U> windowStrides, Operand<U> padding,
       Operand<T> source, Operand<T> initValue, ConcreteFunction select, ConcreteFunction scatter) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SelectAndScatter"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SelectAndScatter");
     opBuilder.addInput(operand.asOutput());
     opBuilder.addInput(windowDimensions.asOutput());
     opBuilder.addInput(windowStrides.asOutput());
     opBuilder.addInput(padding.asOutput());
     opBuilder.addInput(source.asOutput());
     opBuilder.addInput(initValue.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("select", select);
     opBuilder.setAttr("scatter", scatter);
     return new SelectAndScatter<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelfAdjointEig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelfAdjointEig.java
index c9f43898c11..144760c036a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelfAdjointEig.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelfAdjointEig.java
@@ -76,9 +76,8 @@ private SelfAdjointEig(Operation operation) {
   )
   public static <T extends TType> SelfAdjointEig<T> create(Scope scope, Operand<T> a, Boolean lower,
       Long maxIter, Float epsilon) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SelfAdjointEig"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SelfAdjointEig");
     opBuilder.addInput(a.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("lower", lower);
     opBuilder.setAttr("max_iter", maxIter);
     opBuilder.setAttr("epsilon", epsilon);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java
index 8ad5e93eb8f..a83150321d6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java
@@ -56,9 +56,8 @@ private Send(Operation operation) {
       describeByClass = true
   )
   public static Send create(Scope scope, Operand<? extends TType> tensor, String tensorName) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Send"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Send");
     opBuilder.addInput(tensor.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("tensor_name", tensorName);
     return new Send(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SetDynamicDimensionSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SetDynamicDimensionSize.java
index 7388d3d9048..29f605bdc08 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SetDynamicDimensionSize.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SetDynamicDimensionSize.java
@@ -69,11 +69,10 @@ private SetDynamicDimensionSize(Operation operation) {
   )
   public static <T extends TType> SetDynamicDimensionSize<T> create(Scope scope, Operand<T> input,
       Operand<TInt32> dimIndex, Operand<TInt32> sizeOutput) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetDynamicDimensionSize"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SetDynamicDimensionSize");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(dimIndex.asOutput());
     opBuilder.addInput(sizeOutput.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new SetDynamicDimensionSize<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sharding.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sharding.java
index 90921b3a594..d0492f727e4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sharding.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sharding.java
@@ -63,9 +63,8 @@ private Sharding(Operation operation) {
   )
   public static <T extends TType> Sharding<T> create(Scope scope, Operand<T> input,
       Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sharding"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sharding");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     if (options != null) {
       for (Options opts : options) {
         if (opts.sharding != null) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sort.java
index 62fccc9d61d..fd61baf997a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sort.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sort.java
@@ -64,9 +64,8 @@ private Sort(Operation operation) {
       describeByClass = true
   )
   public static <T extends TType> Sort<T> create(Scope scope, Operand<T> input) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sort"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Sort");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new Sort<>(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SpmdFullToShardShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SpmdFullToShardShape.java
index 2cb2377382a..c03b66f8d88 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SpmdFullToShardShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SpmdFullToShardShape.java
@@ -67,9 +67,8 @@ private SpmdFullToShardShape(Operation operation) {
   )
   public static <T extends TType> SpmdFullToShardShape<T> create(Scope scope, Operand<T> input,
       String manualSharding) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SpmdFullToShardShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SpmdFullToShardShape");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("manual_sharding", manualSharding);
     return new SpmdFullToShardShape<>(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SpmdShardToFullShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SpmdShardToFullShape.java
index c4e49461a22..8e44eb9e374 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SpmdShardToFullShape.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SpmdShardToFullShape.java
@@ -68,9 +68,8 @@ private SpmdShardToFullShape(Operation operation) {
   )
   public static <T extends TType> SpmdShardToFullShape<T> create(Scope scope, Operand<T> input,
       String manualSharding, Shape fullShape) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SpmdShardToFullShape"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "SpmdShardToFullShape");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("manual_sharding", manualSharding);
     opBuilder.setAttr("full_shape", fullShape);
     return new SpmdShardToFullShape<>(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Svd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Svd.java
index f124d84e379..c979831e460 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Svd.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Svd.java
@@ -77,9 +77,8 @@ private Svd(Operation operation) {
   )
   public static <T extends TType> Svd<T> create(Scope scope, Operand<T> a, Long maxIter,
       Float epsilon, String precisionConfig) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Svd"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "Svd");
     opBuilder.addInput(a.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("max_iter", maxIter);
     opBuilder.setAttr("epsilon", epsilon);
     opBuilder.setAttr("precision_config", precisionConfig);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/While.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/While.java
index 61e1e3a1ec6..9e9ada04295 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/While.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/While.java
@@ -77,9 +77,8 @@ private While(Operation operation) {
   )
   public static While create(Scope scope, Iterable<Operand<?>> input, ConcreteFunction cond,
       ConcreteFunction body) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("While"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "While");
     opBuilder.addInputList(Operands.asOutputs(input));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("cond", cond);
     opBuilder.setAttr("body", body);
     return new While(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaHostCompute.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaHostCompute.java
index ff628c183c5..6e8d38cd19a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaHostCompute.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaHostCompute.java
@@ -77,9 +77,8 @@ private XlaHostCompute(Operation operation) {
   public static XlaHostCompute create(Scope scope, Iterable<Operand<?>> inputs,
       List<Class<? extends TType>> Toutputs, List<String> ancestors, List<Shape> shapes,
       ConcreteFunction shapeInferenceGraph, String key, Options... options) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaHostCompute"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "XlaHostCompute");
     opBuilder.addInputList(Operands.asOutputs(inputs));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Toutputs", Operands.toDataTypes(Toutputs));
     String[] ancestorsArray = new String[ancestors.size()];
     for (int i = 0 ; i < ancestorsArray.length ; i++) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaLaunch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaLaunch.java
index 110b723def4..6e83c779c1b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaLaunch.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaLaunch.java
@@ -72,11 +72,10 @@ private XlaLaunch(Operation operation) {
   public static XlaLaunch create(Scope scope, Iterable<Operand<?>> constants,
       Iterable<Operand<?>> args, Iterable<Operand<? extends TType>> resources,
       List<Class<? extends TType>> Tresults, ConcreteFunction function) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaLaunch"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "XlaLaunch");
     opBuilder.addInputList(Operands.asOutputs(constants));
     opBuilder.addInputList(Operands.asOutputs(args));
     opBuilder.addInputList(Operands.asOutputs(resources));
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("Tresults", Operands.toDataTypes(Tresults));
     opBuilder.setAttr("function", function);
     return new XlaLaunch(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaRecvFromHost.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaRecvFromHost.java
index aa5e274885c..06178290708 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaRecvFromHost.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaRecvFromHost.java
@@ -70,8 +70,7 @@ private XlaRecvFromHost(Operation operation) {
   )
   public static <T extends TType> XlaRecvFromHost<T> create(Scope scope, Class<T> Toutput,
       Shape shape, String key) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaRecvFromHost"));
-    opBuilder = scope.apply(opBuilder);
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "XlaRecvFromHost");
     opBuilder.setAttr("Toutput", Operands.toDataType(Toutput));
     opBuilder.setAttr("shape", shape);
     opBuilder.setAttr("key", key);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSendToHost.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSendToHost.java
index 6ddcf5b977b..25a9226f6ff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSendToHost.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSendToHost.java
@@ -57,9 +57,8 @@ private XlaSendToHost(Operation operation) {
       describeByClass = true
   )
   public static XlaSendToHost create(Scope scope, Operand<? extends TType> input, String key) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaSendToHost"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "XlaSendToHost");
     opBuilder.addInput(input.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("key", key);
     return new XlaSendToHost(opBuilder.build());
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSetBound.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSetBound.java
index 6303be12289..22ae3a04750 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSetBound.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSetBound.java
@@ -62,10 +62,9 @@ private XlaSetBound(Operation operation) {
       describeByClass = true
   )
   public static XlaSetBound create(Scope scope, Operand<TInt32> input, Operand<TInt32> bound) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaSetBound"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "XlaSetBound");
     opBuilder.addInput(input.asOutput());
     opBuilder.addInput(bound.asOutput());
-    opBuilder = scope.apply(opBuilder);
     return new XlaSetBound(opBuilder.build());
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaVariadicReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaVariadicReduce.java
index 317df94f72e..2ac5ca797e5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaVariadicReduce.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaVariadicReduce.java
@@ -76,10 +76,9 @@ private XlaVariadicReduce(Operation operation) {
   public static <T extends TType> XlaVariadicReduce<T> create(Scope scope,
       Iterable<Operand<T>> input, Iterable<Operand<T>> initValue, List<Long> dimensionsToReduce,
       ConcreteFunction reducer) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaVariadicReduce"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "XlaVariadicReduce");
     opBuilder.addInputList(Operands.asOutputs(input));
     opBuilder.addInputList(Operands.asOutputs(initValue));
-    opBuilder = scope.apply(opBuilder);
     long[] dimensionsToReduceArray = new long[dimensionsToReduce.size()];
     for (int i = 0 ; i < dimensionsToReduceArray.length ; i++) {
       dimensionsToReduceArray[i] = dimensionsToReduce.get(i);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaVariadicSort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaVariadicSort.java
index fdb7d680cc6..c4c8f9f7be4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaVariadicSort.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaVariadicSort.java
@@ -77,10 +77,9 @@ private XlaVariadicSort(Operation operation) {
   )
   public static XlaVariadicSort create(Scope scope, Iterable<Operand<?>> inputs,
       Operand<TInt32> dimension, ConcreteFunction comparator, Boolean isStable) {
-    OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaVariadicSort"));
+    OperationBuilder opBuilder = scope.opBuilder(OP_NAME, "XlaVariadicSort");
     opBuilder.addInputList(Operands.asOutputs(inputs));
     opBuilder.addInput(dimension.asOutput());
-    opBuilder = scope.apply(opBuilder);
     opBuilder.setAttr("comparator", comparator);
     opBuilder.setAttr("is_stable", isStable);
     return new XlaVariadicSort(opBuilder.build());
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/DatasetOptionsProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/DatasetOptionsProtos.java
index 4426fbe9187..51ede7436dd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/DatasetOptionsProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/DatasetOptionsProtos.java
@@ -19,11 +19,6 @@ public static void registerAllExtensions(
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_tensorflow_data_DistributeOptions_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tensorflow_data_MapVectorization_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tensorflow_data_MapVectorization_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_tensorflow_data_OptimizationOptions_descriptor;
   static final 
@@ -52,57 +47,50 @@ public static void registerAllExtensions(
       "ons.proto\022\017tensorflow.data\"\177\n\021Distribute" +
       "Options\022;\n\021auto_shard_policy\030\001 \001(\0162 .ten" +
       "sorflow.data.AutoShardPolicy\022\025\n\013num_devi" +
-      "ces\030\002 \001(\005H\000B\026\n\024optional_num_devices\"v\n\020M" +
-      "apVectorization\022\021\n\007enabled\030\001 \001(\010H\000\022\034\n\022us" +
-      "e_choose_fastest\030\002 \001(\010H\001B\022\n\020optional_ena" +
-      "bledB\035\n\033optional_use_choose_fastest\"\311\010\n\023" +
+      "ces\030\002 \001(\005H\000B\026\n\024optional_num_devices\"\270\006\n\023" +
       "OptimizationOptions\022%\n\033apply_default_opt" +
       "imizations\030\001 \001(\010H\000\022\022\n\010autotune\030\002 \001(\010H\001\022\032" +
       "\n\020autotune_buffers\030\003 \001(\010H\002\022\035\n\023autotune_c" +
       "pu_budget\030\004 \001(\005H\003\022\035\n\023autotune_ram_budget" +
-      "\030\005 \001(\005H\004\022\027\n\rfilter_fusion\030\006 \001(\010H\005\022+\n!fil" +
-      "ter_with_random_uniform_fusion\030\007 \001(\010H\006\022\036" +
-      "\n\024hoist_random_uniform\030\010 \001(\010H\007\022\036\n\024map_an" +
-      "d_batch_fusion\030\t \001(\010H\010\022\037\n\025map_and_filter" +
-      "_fusion\030\n \001(\010H\t\022\024\n\nmap_fusion\030\013 \001(\010H\n\022\035\n" +
-      "\023map_parallelization\030\014 \001(\010H\013\022<\n\021map_vect" +
-      "orization\030\r \001(\0132!.tensorflow.data.MapVec" +
-      "torization\022\032\n\020noop_elimination\030\016 \001(\010H\014\022\030" +
-      "\n\016parallel_batch\030\017 \001(\010H\r\022%\n\033reorder_data" +
-      "_discarding_ops\030\020 \001(\010H\016\022#\n\031shuffle_and_r" +
-      "epeat_fusion\030\021 \001(\010H\017B&\n$optional_apply_d" +
-      "efault_optimizationsB\023\n\021optional_autotun" +
-      "eB\033\n\031optional_autotune_buffersB\036\n\034option" +
-      "al_autotune_cpu_budgetB\036\n\034optional_autot" +
-      "une_ram_budgetB\030\n\026optional_filter_fusion" +
-      "B,\n*optional_filter_with_random_uniform_" +
-      "fusionB\037\n\035optional_hoist_random_uniformB" +
-      "\037\n\035optional_map_and_batch_fusionB \n\036opti" +
-      "onal_map_and_filter_fusionB\025\n\023optional_m" +
-      "ap_fusionB\036\n\034optional_map_parallelizatio" +
-      "nB\033\n\031optional_noop_eliminationB\031\n\027option" +
-      "al_parallel_batchB&\n$optional_reorder_da" +
-      "ta_discarding_opsB$\n\"optional_shuffle_an" +
-      "d_repeat_fusion\"\242\001\n\020ThreadingOptions\022\"\n\030" +
-      "max_intra_op_parallelism\030\001 \001(\005H\000\022!\n\027priv" +
-      "ate_threadpool_size\030\002 \001(\005H\001B#\n!optional_" +
-      "max_intra_op_parallelismB\"\n optional_pri" +
-      "vate_threadpool_size\"\212\003\n\007Options\022\027\n\rdete" +
-      "rministic\030\001 \001(\010H\000\022>\n\022distribute_options\030" +
-      "\002 \001(\0132\".tensorflow.data.DistributeOption" +
-      "s\022B\n\024optimization_options\030\003 \001(\0132$.tensor" +
-      "flow.data.OptimizationOptions\022\017\n\005slack\030\004" +
-      " \001(\010H\001\022<\n\021threading_options\030\005 \001(\0132!.tens" +
-      "orflow.data.ThreadingOptions\022E\n\025external" +
-      "_state_policy\030\006 \001(\0162$.tensorflow.data.Ex" +
-      "ternalStatePolicyH\002B\030\n\026optional_determin" +
-      "isticB\020\n\016optional_slackB \n\036optional_exte" +
-      "rnal_state_policy*K\n\017AutoShardPolicy\022\010\n\004" +
-      "AUTO\020\000\022\010\n\004FILE\020\001\022\010\n\004DATA\020\002\022\010\n\004HINT\020\003\022\020\n\003" +
-      "OFF\020\377\377\377\377\377\377\377\377\377\001*J\n\023ExternalStatePolicy\022\017\n" +
-      "\013POLICY_WARN\020\000\022\021\n\rPOLICY_IGNORE\020\001\022\017\n\013POL" +
-      "ICY_FAIL\020\002B3\n\031org.tensorflow.proto.dataB" +
-      "\024DatasetOptionsProtosP\001b\006proto3"
+      "\030\005 \001(\003H\004\022\027\n\rfilter_fusion\030\006 \001(\010H\005\022\036\n\024map" +
+      "_and_batch_fusion\030\t \001(\010H\006\022\037\n\025map_and_fil" +
+      "ter_fusion\030\n \001(\010H\007\022\024\n\nmap_fusion\030\013 \001(\010H\010" +
+      "\022\035\n\023map_parallelization\030\014 \001(\010H\t\022\032\n\020noop_" +
+      "elimination\030\016 \001(\010H\n\022\030\n\016parallel_batch\030\017 " +
+      "\001(\010H\013\022#\n\031shuffle_and_repeat_fusion\030\021 \001(\010" +
+      "H\014B&\n$optional_apply_default_optimizatio" +
+      "nsB\023\n\021optional_autotuneB\033\n\031optional_auto" +
+      "tune_buffersB\036\n\034optional_autotune_cpu_bu" +
+      "dgetB\036\n\034optional_autotune_ram_budgetB\030\n\026" +
+      "optional_filter_fusionB\037\n\035optional_map_a" +
+      "nd_batch_fusionB \n\036optional_map_and_filt" +
+      "er_fusionB\025\n\023optional_map_fusionB\036\n\034opti" +
+      "onal_map_parallelizationB\033\n\031optional_noo" +
+      "p_eliminationB\031\n\027optional_parallel_batch" +
+      "B$\n\"optional_shuffle_and_repeat_fusionJ\004" +
+      "\010\007\020\010J\004\010\010\020\tJ\004\010\r\020\016J\004\010\020\020\021\"\242\001\n\020ThreadingOpti" +
+      "ons\022\"\n\030max_intra_op_parallelism\030\001 \001(\005H\000\022" +
+      "!\n\027private_threadpool_size\030\002 \001(\005H\001B#\n!op" +
+      "tional_max_intra_op_parallelismB\"\n optio" +
+      "nal_private_threadpool_size\"\212\003\n\007Options\022" +
+      "\027\n\rdeterministic\030\001 \001(\010H\000\022>\n\022distribute_o" +
+      "ptions\030\002 \001(\0132\".tensorflow.data.Distribut" +
+      "eOptions\022B\n\024optimization_options\030\003 \001(\0132$" +
+      ".tensorflow.data.OptimizationOptions\022\017\n\005" +
+      "slack\030\004 \001(\010H\001\022<\n\021threading_options\030\005 \001(\013" +
+      "2!.tensorflow.data.ThreadingOptions\022E\n\025e" +
+      "xternal_state_policy\030\006 \001(\0162$.tensorflow." +
+      "data.ExternalStatePolicyH\002B\030\n\026optional_d" +
+      "eterministicB\020\n\016optional_slackB \n\036option" +
+      "al_external_state_policy*K\n\017AutoShardPol" +
+      "icy\022\010\n\004AUTO\020\000\022\010\n\004FILE\020\001\022\010\n\004DATA\020\002\022\010\n\004HIN" +
+      "T\020\003\022\020\n\003OFF\020\377\377\377\377\377\377\377\377\377\001*J\n\023ExternalStatePo" +
+      "licy\022\017\n\013POLICY_WARN\020\000\022\021\n\rPOLICY_IGNORE\020\001" +
+      "\022\017\n\013POLICY_FAIL\020\002B\213\001\n\031org.tensorflow.pro" +
+      "to.dataB\024DatasetOptionsProtosP\001ZVgithub." +
+      "com/tensorflow/tensorflow/tensorflow/go/" +
+      "core/framework/dataset_options_go_protob" +
+      "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -114,26 +102,20 @@ public static void registerAllExtensions(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_data_DistributeOptions_descriptor,
         new java.lang.String[] { "AutoShardPolicy", "NumDevices", "OptionalNumDevices", });
-    internal_static_tensorflow_data_MapVectorization_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_tensorflow_data_MapVectorization_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tensorflow_data_MapVectorization_descriptor,
-        new java.lang.String[] { "Enabled", "UseChooseFastest", "OptionalEnabled", "OptionalUseChooseFastest", });
     internal_static_tensorflow_data_OptimizationOptions_descriptor =
-      getDescriptor().getMessageTypes().get(2);
+      getDescriptor().getMessageTypes().get(1);
     internal_static_tensorflow_data_OptimizationOptions_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_data_OptimizationOptions_descriptor,
-        new java.lang.String[] { "ApplyDefaultOptimizations", "Autotune", "AutotuneBuffers", "AutotuneCpuBudget", "AutotuneRamBudget", "FilterFusion", "FilterWithRandomUniformFusion", "HoistRandomUniform", "MapAndBatchFusion", "MapAndFilterFusion", "MapFusion", "MapParallelization", "MapVectorization", "NoopElimination", "ParallelBatch", "ReorderDataDiscardingOps", "ShuffleAndRepeatFusion", "OptionalApplyDefaultOptimizations", "OptionalAutotune", "OptionalAutotuneBuffers", "OptionalAutotuneCpuBudget", "OptionalAutotuneRamBudget", "OptionalFilterFusion", "OptionalFilterWithRandomUniformFusion", "OptionalHoistRandomUniform", "OptionalMapAndBatchFusion", "OptionalMapAndFilterFusion", "OptionalMapFusion", "OptionalMapParallelization", "OptionalNoopElimination", "OptionalParallelBatch", "OptionalReorderDataDiscardingOps", "OptionalShuffleAndRepeatFusion", });
+        new java.lang.String[] { "ApplyDefaultOptimizations", "Autotune", "AutotuneBuffers", "AutotuneCpuBudget", "AutotuneRamBudget", "FilterFusion", "MapAndBatchFusion", "MapAndFilterFusion", "MapFusion", "MapParallelization", "NoopElimination", "ParallelBatch", "ShuffleAndRepeatFusion", "OptionalApplyDefaultOptimizations", "OptionalAutotune", "OptionalAutotuneBuffers", "OptionalAutotuneCpuBudget", "OptionalAutotuneRamBudget", "OptionalFilterFusion", "OptionalMapAndBatchFusion", "OptionalMapAndFilterFusion", "OptionalMapFusion", "OptionalMapParallelization", "OptionalNoopElimination", "OptionalParallelBatch", "OptionalShuffleAndRepeatFusion", });
     internal_static_tensorflow_data_ThreadingOptions_descriptor =
-      getDescriptor().getMessageTypes().get(3);
+      getDescriptor().getMessageTypes().get(2);
     internal_static_tensorflow_data_ThreadingOptions_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_data_ThreadingOptions_descriptor,
         new java.lang.String[] { "MaxIntraOpParallelism", "PrivateThreadpoolSize", "OptionalMaxIntraOpParallelism", "OptionalPrivateThreadpoolSize", });
     internal_static_tensorflow_data_Options_descriptor =
-      getDescriptor().getMessageTypes().get(4);
+      getDescriptor().getMessageTypes().get(3);
     internal_static_tensorflow_data_Options_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_data_Options_descriptor,
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/MapVectorization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/MapVectorization.java
deleted file mode 100644
index 235c0895047..00000000000
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/MapVectorization.java
+++ /dev/null
@@ -1,697 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: tensorflow/core/framework/dataset_options.proto
-
-package org.tensorflow.proto.data;
-
-/**
- * Protobuf type {@code tensorflow.data.MapVectorization}
- */
-public  final class MapVectorization extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tensorflow.data.MapVectorization)
-    MapVectorizationOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use MapVectorization.newBuilder() to construct.
-  private MapVectorization(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private MapVectorization() {
-  }
-
-  @java.lang.Override
-  @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(
-      UnusedPrivateParameter unused) {
-    return new MapVectorization();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private MapVectorization(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          case 8: {
-            optionalEnabledCase_ = 1;
-            optionalEnabled_ = input.readBool();
-            break;
-          }
-          case 16: {
-            optionalUseChooseFastestCase_ = 2;
-            optionalUseChooseFastest_ = input.readBool();
-            break;
-          }
-          default: {
-            if (!parseUnknownField(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return org.tensorflow.proto.data.DatasetOptionsProtos.internal_static_tensorflow_data_MapVectorization_descriptor;
-  }
-
-  @java.lang.Override
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return org.tensorflow.proto.data.DatasetOptionsProtos.internal_static_tensorflow_data_MapVectorization_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            org.tensorflow.proto.data.MapVectorization.class, org.tensorflow.proto.data.MapVectorization.Builder.class);
-  }
-
-  private int optionalEnabledCase_ = 0;
-  private java.lang.Object optionalEnabled_;
-  public enum OptionalEnabledCase
-      implements com.google.protobuf.Internal.EnumLite {
-    ENABLED(1),
-    OPTIONALENABLED_NOT_SET(0);
-    private final int value;
-    private OptionalEnabledCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static OptionalEnabledCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static OptionalEnabledCase forNumber(int value) {
-      switch (value) {
-        case 1: return ENABLED;
-        case 0: return OPTIONALENABLED_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public OptionalEnabledCase
-  getOptionalEnabledCase() {
-    return OptionalEnabledCase.forNumber(
-        optionalEnabledCase_);
-  }
-
-  private int optionalUseChooseFastestCase_ = 0;
-  private java.lang.Object optionalUseChooseFastest_;
-  public enum OptionalUseChooseFastestCase
-      implements com.google.protobuf.Internal.EnumLite {
-    USE_CHOOSE_FASTEST(2),
-    OPTIONALUSECHOOSEFASTEST_NOT_SET(0);
-    private final int value;
-    private OptionalUseChooseFastestCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static OptionalUseChooseFastestCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static OptionalUseChooseFastestCase forNumber(int value) {
-      switch (value) {
-        case 2: return USE_CHOOSE_FASTEST;
-        case 0: return OPTIONALUSECHOOSEFASTEST_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public OptionalUseChooseFastestCase
-  getOptionalUseChooseFastestCase() {
-    return OptionalUseChooseFastestCase.forNumber(
-        optionalUseChooseFastestCase_);
-  }
-
-  public static final int ENABLED_FIELD_NUMBER = 1;
-  /**
-   * <code>bool enabled = 1;</code>
-   */
-  public boolean getEnabled() {
-    if (optionalEnabledCase_ == 1) {
-      return (java.lang.Boolean) optionalEnabled_;
-    }
-    return false;
-  }
-
-  public static final int USE_CHOOSE_FASTEST_FIELD_NUMBER = 2;
-  /**
-   * <code>bool use_choose_fastest = 2;</code>
-   */
-  public boolean getUseChooseFastest() {
-    if (optionalUseChooseFastestCase_ == 2) {
-      return (java.lang.Boolean) optionalUseChooseFastest_;
-    }
-    return false;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  @java.lang.Override
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (optionalEnabledCase_ == 1) {
-      output.writeBool(
-          1, (boolean)((java.lang.Boolean) optionalEnabled_));
-    }
-    if (optionalUseChooseFastestCase_ == 2) {
-      output.writeBool(
-          2, (boolean)((java.lang.Boolean) optionalUseChooseFastest_));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  @java.lang.Override
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (optionalEnabledCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(
-            1, (boolean)((java.lang.Boolean) optionalEnabled_));
-    }
-    if (optionalUseChooseFastestCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(
-            2, (boolean)((java.lang.Boolean) optionalUseChooseFastest_));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof org.tensorflow.proto.data.MapVectorization)) {
-      return super.equals(obj);
-    }
-    org.tensorflow.proto.data.MapVectorization other = (org.tensorflow.proto.data.MapVectorization) obj;
-
-    if (!getOptionalEnabledCase().equals(other.getOptionalEnabledCase())) return false;
-    switch (optionalEnabledCase_) {
-      case 1:
-        if (getEnabled()
-            != other.getEnabled()) return false;
-        break;
-      case 0:
-      default:
-    }
-    if (!getOptionalUseChooseFastestCase().equals(other.getOptionalUseChooseFastestCase())) return false;
-    switch (optionalUseChooseFastestCase_) {
-      case 2:
-        if (getUseChooseFastest()
-            != other.getUseChooseFastest()) return false;
-        break;
-      case 0:
-      default:
-    }
-    if (!unknownFields.equals(other.unknownFields)) return false;
-    return true;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (optionalEnabledCase_) {
-      case 1:
-        hash = (37 * hash) + ENABLED_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getEnabled());
-        break;
-      case 0:
-      default:
-    }
-    switch (optionalUseChooseFastestCase_) {
-      case 2:
-        hash = (37 * hash) + USE_CHOOSE_FASTEST_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getUseChooseFastest());
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static org.tensorflow.proto.data.MapVectorization parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  @java.lang.Override
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(org.tensorflow.proto.data.MapVectorization prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  @java.lang.Override
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * Protobuf type {@code tensorflow.data.MapVectorization}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tensorflow.data.MapVectorization)
-      org.tensorflow.proto.data.MapVectorizationOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return org.tensorflow.proto.data.DatasetOptionsProtos.internal_static_tensorflow_data_MapVectorization_descriptor;
-    }
-
-    @java.lang.Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return org.tensorflow.proto.data.DatasetOptionsProtos.internal_static_tensorflow_data_MapVectorization_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.tensorflow.proto.data.MapVectorization.class, org.tensorflow.proto.data.MapVectorization.Builder.class);
-    }
-
-    // Construct using org.tensorflow.proto.data.MapVectorization.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    @java.lang.Override
-    public Builder clear() {
-      super.clear();
-      optionalEnabledCase_ = 0;
-      optionalEnabled_ = null;
-      optionalUseChooseFastestCase_ = 0;
-      optionalUseChooseFastest_ = null;
-      return this;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return org.tensorflow.proto.data.DatasetOptionsProtos.internal_static_tensorflow_data_MapVectorization_descriptor;
-    }
-
-    @java.lang.Override
-    public org.tensorflow.proto.data.MapVectorization getDefaultInstanceForType() {
-      return org.tensorflow.proto.data.MapVectorization.getDefaultInstance();
-    }
-
-    @java.lang.Override
-    public org.tensorflow.proto.data.MapVectorization build() {
-      org.tensorflow.proto.data.MapVectorization result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    @java.lang.Override
-    public org.tensorflow.proto.data.MapVectorization buildPartial() {
-      org.tensorflow.proto.data.MapVectorization result = new org.tensorflow.proto.data.MapVectorization(this);
-      if (optionalEnabledCase_ == 1) {
-        result.optionalEnabled_ = optionalEnabled_;
-      }
-      if (optionalUseChooseFastestCase_ == 2) {
-        result.optionalUseChooseFastest_ = optionalUseChooseFastest_;
-      }
-      result.optionalEnabledCase_ = optionalEnabledCase_;
-      result.optionalUseChooseFastestCase_ = optionalUseChooseFastestCase_;
-      onBuilt();
-      return result;
-    }
-
-    @java.lang.Override
-    public Builder clone() {
-      return super.clone();
-    }
-    @java.lang.Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return super.setField(field, value);
-    }
-    @java.lang.Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return super.clearField(field);
-    }
-    @java.lang.Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return super.clearOneof(oneof);
-    }
-    @java.lang.Override
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return super.setRepeatedField(field, index, value);
-    }
-    @java.lang.Override
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return super.addRepeatedField(field, value);
-    }
-    @java.lang.Override
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.tensorflow.proto.data.MapVectorization) {
-        return mergeFrom((org.tensorflow.proto.data.MapVectorization)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(org.tensorflow.proto.data.MapVectorization other) {
-      if (other == org.tensorflow.proto.data.MapVectorization.getDefaultInstance()) return this;
-      switch (other.getOptionalEnabledCase()) {
-        case ENABLED: {
-          setEnabled(other.getEnabled());
-          break;
-        }
-        case OPTIONALENABLED_NOT_SET: {
-          break;
-        }
-      }
-      switch (other.getOptionalUseChooseFastestCase()) {
-        case USE_CHOOSE_FASTEST: {
-          setUseChooseFastest(other.getUseChooseFastest());
-          break;
-        }
-        case OPTIONALUSECHOOSEFASTEST_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    @java.lang.Override
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    @java.lang.Override
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      org.tensorflow.proto.data.MapVectorization parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (org.tensorflow.proto.data.MapVectorization) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int optionalEnabledCase_ = 0;
-    private java.lang.Object optionalEnabled_;
-    public OptionalEnabledCase
-        getOptionalEnabledCase() {
-      return OptionalEnabledCase.forNumber(
-          optionalEnabledCase_);
-    }
-
-    public Builder clearOptionalEnabled() {
-      optionalEnabledCase_ = 0;
-      optionalEnabled_ = null;
-      onChanged();
-      return this;
-    }
-
-    private int optionalUseChooseFastestCase_ = 0;
-    private java.lang.Object optionalUseChooseFastest_;
-    public OptionalUseChooseFastestCase
-        getOptionalUseChooseFastestCase() {
-      return OptionalUseChooseFastestCase.forNumber(
-          optionalUseChooseFastestCase_);
-    }
-
-    public Builder clearOptionalUseChooseFastest() {
-      optionalUseChooseFastestCase_ = 0;
-      optionalUseChooseFastest_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    /**
-     * <code>bool enabled = 1;</code>
-     */
-    public boolean getEnabled() {
-      if (optionalEnabledCase_ == 1) {
-        return (java.lang.Boolean) optionalEnabled_;
-      }
-      return false;
-    }
-    /**
-     * <code>bool enabled = 1;</code>
-     */
-    public Builder setEnabled(boolean value) {
-      optionalEnabledCase_ = 1;
-      optionalEnabled_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool enabled = 1;</code>
-     */
-    public Builder clearEnabled() {
-      if (optionalEnabledCase_ == 1) {
-        optionalEnabledCase_ = 0;
-        optionalEnabled_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
-    /**
-     * <code>bool use_choose_fastest = 2;</code>
-     */
-    public boolean getUseChooseFastest() {
-      if (optionalUseChooseFastestCase_ == 2) {
-        return (java.lang.Boolean) optionalUseChooseFastest_;
-      }
-      return false;
-    }
-    /**
-     * <code>bool use_choose_fastest = 2;</code>
-     */
-    public Builder setUseChooseFastest(boolean value) {
-      optionalUseChooseFastestCase_ = 2;
-      optionalUseChooseFastest_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool use_choose_fastest = 2;</code>
-     */
-    public Builder clearUseChooseFastest() {
-      if (optionalUseChooseFastestCase_ == 2) {
-        optionalUseChooseFastestCase_ = 0;
-        optionalUseChooseFastest_ = null;
-        onChanged();
-      }
-      return this;
-    }
-    @java.lang.Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFields(unknownFields);
-    }
-
-    @java.lang.Override
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:tensorflow.data.MapVectorization)
-  }
-
-  // @@protoc_insertion_point(class_scope:tensorflow.data.MapVectorization)
-  private static final org.tensorflow.proto.data.MapVectorization DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new org.tensorflow.proto.data.MapVectorization();
-  }
-
-  public static org.tensorflow.proto.data.MapVectorization getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<MapVectorization>
-      PARSER = new com.google.protobuf.AbstractParser<MapVectorization>() {
-    @java.lang.Override
-    public MapVectorization parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MapVectorization(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<MapVectorization> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<MapVectorization> getParserForType() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public org.tensorflow.proto.data.MapVectorization getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/MapVectorizationOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/MapVectorizationOrBuilder.java
deleted file mode 100644
index 0a09b9379c8..00000000000
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/MapVectorizationOrBuilder.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: tensorflow/core/framework/dataset_options.proto
-
-package org.tensorflow.proto.data;
-
-public interface MapVectorizationOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tensorflow.data.MapVectorization)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * <code>bool enabled = 1;</code>
-   */
-  boolean getEnabled();
-
-  /**
-   * <code>bool use_choose_fastest = 2;</code>
-   */
-  boolean getUseChooseFastest();
-
-  public org.tensorflow.proto.data.MapVectorization.OptionalEnabledCase getOptionalEnabledCase();
-
-  public org.tensorflow.proto.data.MapVectorization.OptionalUseChooseFastestCase getOptionalUseChooseFastestCase();
-}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/OptimizationOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/OptimizationOptions.java
index f470fdd27a4..eac7b3d4136 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/OptimizationOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/OptimizationOptions.java
@@ -70,7 +70,7 @@ private OptimizationOptions(
           }
           case 40: {
             optionalAutotuneRamBudgetCase_ = 5;
-            optionalAutotuneRamBudget_ = input.readInt32();
+            optionalAutotuneRamBudget_ = input.readInt64();
             break;
           }
           case 48: {
@@ -78,16 +78,6 @@ private OptimizationOptions(
             optionalFilterFusion_ = input.readBool();
             break;
           }
-          case 56: {
-            optionalFilterWithRandomUniformFusionCase_ = 7;
-            optionalFilterWithRandomUniformFusion_ = input.readBool();
-            break;
-          }
-          case 64: {
-            optionalHoistRandomUniformCase_ = 8;
-            optionalHoistRandomUniform_ = input.readBool();
-            break;
-          }
           case 72: {
             optionalMapAndBatchFusionCase_ = 9;
             optionalMapAndBatchFusion_ = input.readBool();
@@ -108,19 +98,6 @@ private OptimizationOptions(
             optionalMapParallelization_ = input.readBool();
             break;
           }
-          case 106: {
-            org.tensorflow.proto.data.MapVectorization.Builder subBuilder = null;
-            if (mapVectorization_ != null) {
-              subBuilder = mapVectorization_.toBuilder();
-            }
-            mapVectorization_ = input.readMessage(org.tensorflow.proto.data.MapVectorization.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(mapVectorization_);
-              mapVectorization_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
           case 112: {
             optionalNoopEliminationCase_ = 14;
             optionalNoopElimination_ = input.readBool();
@@ -131,11 +108,6 @@ private OptimizationOptions(
             optionalParallelBatch_ = input.readBool();
             break;
           }
-          case 128: {
-            optionalReorderDataDiscardingOpsCase_ = 16;
-            optionalReorderDataDiscardingOps_ = input.readBool();
-            break;
-          }
           case 136: {
             optionalShuffleAndRepeatFusionCase_ = 17;
             optionalShuffleAndRepeatFusion_ = input.readBool();
@@ -389,78 +361,6 @@ public int getNumber() {
         optionalFilterFusionCase_);
   }
 
-  private int optionalFilterWithRandomUniformFusionCase_ = 0;
-  private java.lang.Object optionalFilterWithRandomUniformFusion_;
-  public enum OptionalFilterWithRandomUniformFusionCase
-      implements com.google.protobuf.Internal.EnumLite {
-    FILTER_WITH_RANDOM_UNIFORM_FUSION(7),
-    OPTIONALFILTERWITHRANDOMUNIFORMFUSION_NOT_SET(0);
-    private final int value;
-    private OptionalFilterWithRandomUniformFusionCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static OptionalFilterWithRandomUniformFusionCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static OptionalFilterWithRandomUniformFusionCase forNumber(int value) {
-      switch (value) {
-        case 7: return FILTER_WITH_RANDOM_UNIFORM_FUSION;
-        case 0: return OPTIONALFILTERWITHRANDOMUNIFORMFUSION_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public OptionalFilterWithRandomUniformFusionCase
-  getOptionalFilterWithRandomUniformFusionCase() {
-    return OptionalFilterWithRandomUniformFusionCase.forNumber(
-        optionalFilterWithRandomUniformFusionCase_);
-  }
-
-  private int optionalHoistRandomUniformCase_ = 0;
-  private java.lang.Object optionalHoistRandomUniform_;
-  public enum OptionalHoistRandomUniformCase
-      implements com.google.protobuf.Internal.EnumLite {
-    HOIST_RANDOM_UNIFORM(8),
-    OPTIONALHOISTRANDOMUNIFORM_NOT_SET(0);
-    private final int value;
-    private OptionalHoistRandomUniformCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static OptionalHoistRandomUniformCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static OptionalHoistRandomUniformCase forNumber(int value) {
-      switch (value) {
-        case 8: return HOIST_RANDOM_UNIFORM;
-        case 0: return OPTIONALHOISTRANDOMUNIFORM_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public OptionalHoistRandomUniformCase
-  getOptionalHoistRandomUniformCase() {
-    return OptionalHoistRandomUniformCase.forNumber(
-        optionalHoistRandomUniformCase_);
-  }
-
   private int optionalMapAndBatchFusionCase_ = 0;
   private java.lang.Object optionalMapAndBatchFusion_;
   public enum OptionalMapAndBatchFusionCase
@@ -677,42 +577,6 @@ public int getNumber() {
         optionalParallelBatchCase_);
   }
 
-  private int optionalReorderDataDiscardingOpsCase_ = 0;
-  private java.lang.Object optionalReorderDataDiscardingOps_;
-  public enum OptionalReorderDataDiscardingOpsCase
-      implements com.google.protobuf.Internal.EnumLite {
-    REORDER_DATA_DISCARDING_OPS(16),
-    OPTIONALREORDERDATADISCARDINGOPS_NOT_SET(0);
-    private final int value;
-    private OptionalReorderDataDiscardingOpsCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static OptionalReorderDataDiscardingOpsCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static OptionalReorderDataDiscardingOpsCase forNumber(int value) {
-      switch (value) {
-        case 16: return REORDER_DATA_DISCARDING_OPS;
-        case 0: return OPTIONALREORDERDATADISCARDINGOPS_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public OptionalReorderDataDiscardingOpsCase
-  getOptionalReorderDataDiscardingOpsCase() {
-    return OptionalReorderDataDiscardingOpsCase.forNumber(
-        optionalReorderDataDiscardingOpsCase_);
-  }
-
   private int optionalShuffleAndRepeatFusionCase_ = 0;
   private java.lang.Object optionalShuffleAndRepeatFusion_;
   public enum OptionalShuffleAndRepeatFusionCase
@@ -795,13 +659,13 @@ public int getAutotuneCpuBudget() {
 
   public static final int AUTOTUNE_RAM_BUDGET_FIELD_NUMBER = 5;
   /**
-   * <code>int32 autotune_ram_budget = 5;</code>
+   * <code>int64 autotune_ram_budget = 5;</code>
    */
-  public int getAutotuneRamBudget() {
+  public long getAutotuneRamBudget() {
     if (optionalAutotuneRamBudgetCase_ == 5) {
-      return (java.lang.Integer) optionalAutotuneRamBudget_;
+      return (java.lang.Long) optionalAutotuneRamBudget_;
     }
-    return 0;
+    return 0L;
   }
 
   public static final int FILTER_FUSION_FIELD_NUMBER = 6;
@@ -815,28 +679,6 @@ public boolean getFilterFusion() {
     return false;
   }
 
-  public static final int FILTER_WITH_RANDOM_UNIFORM_FUSION_FIELD_NUMBER = 7;
-  /**
-   * <code>bool filter_with_random_uniform_fusion = 7;</code>
-   */
-  public boolean getFilterWithRandomUniformFusion() {
-    if (optionalFilterWithRandomUniformFusionCase_ == 7) {
-      return (java.lang.Boolean) optionalFilterWithRandomUniformFusion_;
-    }
-    return false;
-  }
-
-  public static final int HOIST_RANDOM_UNIFORM_FIELD_NUMBER = 8;
-  /**
-   * <code>bool hoist_random_uniform = 8;</code>
-   */
-  public boolean getHoistRandomUniform() {
-    if (optionalHoistRandomUniformCase_ == 8) {
-      return (java.lang.Boolean) optionalHoistRandomUniform_;
-    }
-    return false;
-  }
-
   public static final int MAP_AND_BATCH_FUSION_FIELD_NUMBER = 9;
   /**
    * <code>bool map_and_batch_fusion = 9;</code>
@@ -881,39 +723,6 @@ public boolean getMapParallelization() {
     return false;
   }
 
-  public static final int MAP_VECTORIZATION_FIELD_NUMBER = 13;
-  private org.tensorflow.proto.data.MapVectorization mapVectorization_;
-  /**
-   * <pre>
-   * The map vectorization options associated with the dataset.
-   * </pre>
-   *
-   * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-   */
-  public boolean hasMapVectorization() {
-    return mapVectorization_ != null;
-  }
-  /**
-   * <pre>
-   * The map vectorization options associated with the dataset.
-   * </pre>
-   *
-   * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-   */
-  public org.tensorflow.proto.data.MapVectorization getMapVectorization() {
-    return mapVectorization_ == null ? org.tensorflow.proto.data.MapVectorization.getDefaultInstance() : mapVectorization_;
-  }
-  /**
-   * <pre>
-   * The map vectorization options associated with the dataset.
-   * </pre>
-   *
-   * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-   */
-  public org.tensorflow.proto.data.MapVectorizationOrBuilder getMapVectorizationOrBuilder() {
-    return getMapVectorization();
-  }
-
   public static final int NOOP_ELIMINATION_FIELD_NUMBER = 14;
   /**
    * <code>bool noop_elimination = 14;</code>
@@ -936,17 +745,6 @@ public boolean getParallelBatch() {
     return false;
   }
 
-  public static final int REORDER_DATA_DISCARDING_OPS_FIELD_NUMBER = 16;
-  /**
-   * <code>bool reorder_data_discarding_ops = 16;</code>
-   */
-  public boolean getReorderDataDiscardingOps() {
-    if (optionalReorderDataDiscardingOpsCase_ == 16) {
-      return (java.lang.Boolean) optionalReorderDataDiscardingOps_;
-    }
-    return false;
-  }
-
   public static final int SHUFFLE_AND_REPEAT_FUSION_FIELD_NUMBER = 17;
   /**
    * <code>bool shuffle_and_repeat_fusion = 17;</code>
@@ -989,21 +787,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           4, (int)((java.lang.Integer) optionalAutotuneCpuBudget_));
     }
     if (optionalAutotuneRamBudgetCase_ == 5) {
-      output.writeInt32(
-          5, (int)((java.lang.Integer) optionalAutotuneRamBudget_));
+      output.writeInt64(
+          5, (long)((java.lang.Long) optionalAutotuneRamBudget_));
     }
     if (optionalFilterFusionCase_ == 6) {
       output.writeBool(
           6, (boolean)((java.lang.Boolean) optionalFilterFusion_));
     }
-    if (optionalFilterWithRandomUniformFusionCase_ == 7) {
-      output.writeBool(
-          7, (boolean)((java.lang.Boolean) optionalFilterWithRandomUniformFusion_));
-    }
-    if (optionalHoistRandomUniformCase_ == 8) {
-      output.writeBool(
-          8, (boolean)((java.lang.Boolean) optionalHoistRandomUniform_));
-    }
     if (optionalMapAndBatchFusionCase_ == 9) {
       output.writeBool(
           9, (boolean)((java.lang.Boolean) optionalMapAndBatchFusion_));
@@ -1020,9 +810,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       output.writeBool(
           12, (boolean)((java.lang.Boolean) optionalMapParallelization_));
     }
-    if (mapVectorization_ != null) {
-      output.writeMessage(13, getMapVectorization());
-    }
     if (optionalNoopEliminationCase_ == 14) {
       output.writeBool(
           14, (boolean)((java.lang.Boolean) optionalNoopElimination_));
@@ -1031,10 +818,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       output.writeBool(
           15, (boolean)((java.lang.Boolean) optionalParallelBatch_));
     }
-    if (optionalReorderDataDiscardingOpsCase_ == 16) {
-      output.writeBool(
-          16, (boolean)((java.lang.Boolean) optionalReorderDataDiscardingOps_));
-    }
     if (optionalShuffleAndRepeatFusionCase_ == 17) {
       output.writeBool(
           17, (boolean)((java.lang.Boolean) optionalShuffleAndRepeatFusion_));
@@ -1070,24 +853,14 @@ public int getSerializedSize() {
     }
     if (optionalAutotuneRamBudgetCase_ == 5) {
       size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(
-            5, (int)((java.lang.Integer) optionalAutotuneRamBudget_));
+        .computeInt64Size(
+            5, (long)((java.lang.Long) optionalAutotuneRamBudget_));
     }
     if (optionalFilterFusionCase_ == 6) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(
             6, (boolean)((java.lang.Boolean) optionalFilterFusion_));
     }
-    if (optionalFilterWithRandomUniformFusionCase_ == 7) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(
-            7, (boolean)((java.lang.Boolean) optionalFilterWithRandomUniformFusion_));
-    }
-    if (optionalHoistRandomUniformCase_ == 8) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(
-            8, (boolean)((java.lang.Boolean) optionalHoistRandomUniform_));
-    }
     if (optionalMapAndBatchFusionCase_ == 9) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(
@@ -1108,10 +881,6 @@ public int getSerializedSize() {
         .computeBoolSize(
             12, (boolean)((java.lang.Boolean) optionalMapParallelization_));
     }
-    if (mapVectorization_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(13, getMapVectorization());
-    }
     if (optionalNoopEliminationCase_ == 14) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(
@@ -1122,11 +891,6 @@ public int getSerializedSize() {
         .computeBoolSize(
             15, (boolean)((java.lang.Boolean) optionalParallelBatch_));
     }
-    if (optionalReorderDataDiscardingOpsCase_ == 16) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(
-            16, (boolean)((java.lang.Boolean) optionalReorderDataDiscardingOps_));
-    }
     if (optionalShuffleAndRepeatFusionCase_ == 17) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(
@@ -1147,11 +911,6 @@ public boolean equals(final java.lang.Object obj) {
     }
     org.tensorflow.proto.data.OptimizationOptions other = (org.tensorflow.proto.data.OptimizationOptions) obj;
 
-    if (hasMapVectorization() != other.hasMapVectorization()) return false;
-    if (hasMapVectorization()) {
-      if (!getMapVectorization()
-          .equals(other.getMapVectorization())) return false;
-    }
     if (!getOptionalApplyDefaultOptimizationsCase().equals(other.getOptionalApplyDefaultOptimizationsCase())) return false;
     switch (optionalApplyDefaultOptimizationsCase_) {
       case 1:
@@ -1206,24 +965,6 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getOptionalFilterWithRandomUniformFusionCase().equals(other.getOptionalFilterWithRandomUniformFusionCase())) return false;
-    switch (optionalFilterWithRandomUniformFusionCase_) {
-      case 7:
-        if (getFilterWithRandomUniformFusion()
-            != other.getFilterWithRandomUniformFusion()) return false;
-        break;
-      case 0:
-      default:
-    }
-    if (!getOptionalHoistRandomUniformCase().equals(other.getOptionalHoistRandomUniformCase())) return false;
-    switch (optionalHoistRandomUniformCase_) {
-      case 8:
-        if (getHoistRandomUniform()
-            != other.getHoistRandomUniform()) return false;
-        break;
-      case 0:
-      default:
-    }
     if (!getOptionalMapAndBatchFusionCase().equals(other.getOptionalMapAndBatchFusionCase())) return false;
     switch (optionalMapAndBatchFusionCase_) {
       case 9:
@@ -1278,15 +1019,6 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getOptionalReorderDataDiscardingOpsCase().equals(other.getOptionalReorderDataDiscardingOpsCase())) return false;
-    switch (optionalReorderDataDiscardingOpsCase_) {
-      case 16:
-        if (getReorderDataDiscardingOps()
-            != other.getReorderDataDiscardingOps()) return false;
-        break;
-      case 0:
-      default:
-    }
     if (!getOptionalShuffleAndRepeatFusionCase().equals(other.getOptionalShuffleAndRepeatFusionCase())) return false;
     switch (optionalShuffleAndRepeatFusionCase_) {
       case 17:
@@ -1307,10 +1039,6 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasMapVectorization()) {
-      hash = (37 * hash) + MAP_VECTORIZATION_FIELD_NUMBER;
-      hash = (53 * hash) + getMapVectorization().hashCode();
-    }
     switch (optionalApplyDefaultOptimizationsCase_) {
       case 1:
         hash = (37 * hash) + APPLY_DEFAULT_OPTIMIZATIONS_FIELD_NUMBER;
@@ -1349,7 +1077,8 @@ public int hashCode() {
     switch (optionalAutotuneRamBudgetCase_) {
       case 5:
         hash = (37 * hash) + AUTOTUNE_RAM_BUDGET_FIELD_NUMBER;
-        hash = (53 * hash) + getAutotuneRamBudget();
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getAutotuneRamBudget());
         break;
       case 0:
       default:
@@ -1363,24 +1092,6 @@ public int hashCode() {
       case 0:
       default:
     }
-    switch (optionalFilterWithRandomUniformFusionCase_) {
-      case 7:
-        hash = (37 * hash) + FILTER_WITH_RANDOM_UNIFORM_FUSION_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getFilterWithRandomUniformFusion());
-        break;
-      case 0:
-      default:
-    }
-    switch (optionalHoistRandomUniformCase_) {
-      case 8:
-        hash = (37 * hash) + HOIST_RANDOM_UNIFORM_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getHoistRandomUniform());
-        break;
-      case 0:
-      default:
-    }
     switch (optionalMapAndBatchFusionCase_) {
       case 9:
         hash = (37 * hash) + MAP_AND_BATCH_FUSION_FIELD_NUMBER;
@@ -1435,15 +1146,6 @@ public int hashCode() {
       case 0:
       default:
     }
-    switch (optionalReorderDataDiscardingOpsCase_) {
-      case 16:
-        hash = (37 * hash) + REORDER_DATA_DISCARDING_OPS_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getReorderDataDiscardingOps());
-        break;
-      case 0:
-      default:
-    }
     switch (optionalShuffleAndRepeatFusionCase_) {
       case 17:
         hash = (37 * hash) + SHUFFLE_AND_REPEAT_FUSION_FIELD_NUMBER;
@@ -1586,12 +1288,6 @@ private void maybeForceBuilderInitialization() {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (mapVectorizationBuilder_ == null) {
-        mapVectorization_ = null;
-      } else {
-        mapVectorization_ = null;
-        mapVectorizationBuilder_ = null;
-      }
       optionalApplyDefaultOptimizationsCase_ = 0;
       optionalApplyDefaultOptimizations_ = null;
       optionalAutotuneCase_ = 0;
@@ -1604,10 +1300,6 @@ public Builder clear() {
       optionalAutotuneRamBudget_ = null;
       optionalFilterFusionCase_ = 0;
       optionalFilterFusion_ = null;
-      optionalFilterWithRandomUniformFusionCase_ = 0;
-      optionalFilterWithRandomUniformFusion_ = null;
-      optionalHoistRandomUniformCase_ = 0;
-      optionalHoistRandomUniform_ = null;
       optionalMapAndBatchFusionCase_ = 0;
       optionalMapAndBatchFusion_ = null;
       optionalMapAndFilterFusionCase_ = 0;
@@ -1620,8 +1312,6 @@ public Builder clear() {
       optionalNoopElimination_ = null;
       optionalParallelBatchCase_ = 0;
       optionalParallelBatch_ = null;
-      optionalReorderDataDiscardingOpsCase_ = 0;
-      optionalReorderDataDiscardingOps_ = null;
       optionalShuffleAndRepeatFusionCase_ = 0;
       optionalShuffleAndRepeatFusion_ = null;
       return this;
@@ -1668,12 +1358,6 @@ public org.tensorflow.proto.data.OptimizationOptions buildPartial() {
       if (optionalFilterFusionCase_ == 6) {
         result.optionalFilterFusion_ = optionalFilterFusion_;
       }
-      if (optionalFilterWithRandomUniformFusionCase_ == 7) {
-        result.optionalFilterWithRandomUniformFusion_ = optionalFilterWithRandomUniformFusion_;
-      }
-      if (optionalHoistRandomUniformCase_ == 8) {
-        result.optionalHoistRandomUniform_ = optionalHoistRandomUniform_;
-      }
       if (optionalMapAndBatchFusionCase_ == 9) {
         result.optionalMapAndBatchFusion_ = optionalMapAndBatchFusion_;
       }
@@ -1686,20 +1370,12 @@ public org.tensorflow.proto.data.OptimizationOptions buildPartial() {
       if (optionalMapParallelizationCase_ == 12) {
         result.optionalMapParallelization_ = optionalMapParallelization_;
       }
-      if (mapVectorizationBuilder_ == null) {
-        result.mapVectorization_ = mapVectorization_;
-      } else {
-        result.mapVectorization_ = mapVectorizationBuilder_.build();
-      }
       if (optionalNoopEliminationCase_ == 14) {
         result.optionalNoopElimination_ = optionalNoopElimination_;
       }
       if (optionalParallelBatchCase_ == 15) {
         result.optionalParallelBatch_ = optionalParallelBatch_;
       }
-      if (optionalReorderDataDiscardingOpsCase_ == 16) {
-        result.optionalReorderDataDiscardingOps_ = optionalReorderDataDiscardingOps_;
-      }
       if (optionalShuffleAndRepeatFusionCase_ == 17) {
         result.optionalShuffleAndRepeatFusion_ = optionalShuffleAndRepeatFusion_;
       }
@@ -1709,15 +1385,12 @@ public org.tensorflow.proto.data.OptimizationOptions buildPartial() {
       result.optionalAutotuneCpuBudgetCase_ = optionalAutotuneCpuBudgetCase_;
       result.optionalAutotuneRamBudgetCase_ = optionalAutotuneRamBudgetCase_;
       result.optionalFilterFusionCase_ = optionalFilterFusionCase_;
-      result.optionalFilterWithRandomUniformFusionCase_ = optionalFilterWithRandomUniformFusionCase_;
-      result.optionalHoistRandomUniformCase_ = optionalHoistRandomUniformCase_;
       result.optionalMapAndBatchFusionCase_ = optionalMapAndBatchFusionCase_;
       result.optionalMapAndFilterFusionCase_ = optionalMapAndFilterFusionCase_;
       result.optionalMapFusionCase_ = optionalMapFusionCase_;
       result.optionalMapParallelizationCase_ = optionalMapParallelizationCase_;
       result.optionalNoopEliminationCase_ = optionalNoopEliminationCase_;
       result.optionalParallelBatchCase_ = optionalParallelBatchCase_;
-      result.optionalReorderDataDiscardingOpsCase_ = optionalReorderDataDiscardingOpsCase_;
       result.optionalShuffleAndRepeatFusionCase_ = optionalShuffleAndRepeatFusionCase_;
       onBuilt();
       return result;
@@ -1767,9 +1440,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(org.tensorflow.proto.data.OptimizationOptions other) {
       if (other == org.tensorflow.proto.data.OptimizationOptions.getDefaultInstance()) return this;
-      if (other.hasMapVectorization()) {
-        mergeMapVectorization(other.getMapVectorization());
-      }
       switch (other.getOptionalApplyDefaultOptimizationsCase()) {
         case APPLY_DEFAULT_OPTIMIZATIONS: {
           setApplyDefaultOptimizations(other.getApplyDefaultOptimizations());
@@ -1824,24 +1494,6 @@ public Builder mergeFrom(org.tensorflow.proto.data.OptimizationOptions other) {
           break;
         }
       }
-      switch (other.getOptionalFilterWithRandomUniformFusionCase()) {
-        case FILTER_WITH_RANDOM_UNIFORM_FUSION: {
-          setFilterWithRandomUniformFusion(other.getFilterWithRandomUniformFusion());
-          break;
-        }
-        case OPTIONALFILTERWITHRANDOMUNIFORMFUSION_NOT_SET: {
-          break;
-        }
-      }
-      switch (other.getOptionalHoistRandomUniformCase()) {
-        case HOIST_RANDOM_UNIFORM: {
-          setHoistRandomUniform(other.getHoistRandomUniform());
-          break;
-        }
-        case OPTIONALHOISTRANDOMUNIFORM_NOT_SET: {
-          break;
-        }
-      }
       switch (other.getOptionalMapAndBatchFusionCase()) {
         case MAP_AND_BATCH_FUSION: {
           setMapAndBatchFusion(other.getMapAndBatchFusion());
@@ -1896,15 +1548,6 @@ public Builder mergeFrom(org.tensorflow.proto.data.OptimizationOptions other) {
           break;
         }
       }
-      switch (other.getOptionalReorderDataDiscardingOpsCase()) {
-        case REORDER_DATA_DISCARDING_OPS: {
-          setReorderDataDiscardingOps(other.getReorderDataDiscardingOps());
-          break;
-        }
-        case OPTIONALREORDERDATADISCARDINGOPS_NOT_SET: {
-          break;
-        }
-      }
       switch (other.getOptionalShuffleAndRepeatFusionCase()) {
         case SHUFFLE_AND_REPEAT_FUSION: {
           setShuffleAndRepeatFusion(other.getShuffleAndRepeatFusion());
@@ -2032,36 +1675,6 @@ public Builder clearOptionalFilterFusion() {
       return this;
     }
 
-    private int optionalFilterWithRandomUniformFusionCase_ = 0;
-    private java.lang.Object optionalFilterWithRandomUniformFusion_;
-    public OptionalFilterWithRandomUniformFusionCase
-        getOptionalFilterWithRandomUniformFusionCase() {
-      return OptionalFilterWithRandomUniformFusionCase.forNumber(
-          optionalFilterWithRandomUniformFusionCase_);
-    }
-
-    public Builder clearOptionalFilterWithRandomUniformFusion() {
-      optionalFilterWithRandomUniformFusionCase_ = 0;
-      optionalFilterWithRandomUniformFusion_ = null;
-      onChanged();
-      return this;
-    }
-
-    private int optionalHoistRandomUniformCase_ = 0;
-    private java.lang.Object optionalHoistRandomUniform_;
-    public OptionalHoistRandomUniformCase
-        getOptionalHoistRandomUniformCase() {
-      return OptionalHoistRandomUniformCase.forNumber(
-          optionalHoistRandomUniformCase_);
-    }
-
-    public Builder clearOptionalHoistRandomUniform() {
-      optionalHoistRandomUniformCase_ = 0;
-      optionalHoistRandomUniform_ = null;
-      onChanged();
-      return this;
-    }
-
     private int optionalMapAndBatchFusionCase_ = 0;
     private java.lang.Object optionalMapAndBatchFusion_;
     public OptionalMapAndBatchFusionCase
@@ -2152,21 +1765,6 @@ public Builder clearOptionalParallelBatch() {
       return this;
     }
 
-    private int optionalReorderDataDiscardingOpsCase_ = 0;
-    private java.lang.Object optionalReorderDataDiscardingOps_;
-    public OptionalReorderDataDiscardingOpsCase
-        getOptionalReorderDataDiscardingOpsCase() {
-      return OptionalReorderDataDiscardingOpsCase.forNumber(
-          optionalReorderDataDiscardingOpsCase_);
-    }
-
-    public Builder clearOptionalReorderDataDiscardingOps() {
-      optionalReorderDataDiscardingOpsCase_ = 0;
-      optionalReorderDataDiscardingOps_ = null;
-      onChanged();
-      return this;
-    }
-
     private int optionalShuffleAndRepeatFusionCase_ = 0;
     private java.lang.Object optionalShuffleAndRepeatFusion_;
     public OptionalShuffleAndRepeatFusionCase
@@ -2304,25 +1902,25 @@ public Builder clearAutotuneCpuBudget() {
     }
 
     /**
-     * <code>int32 autotune_ram_budget = 5;</code>
+     * <code>int64 autotune_ram_budget = 5;</code>
      */
-    public int getAutotuneRamBudget() {
+    public long getAutotuneRamBudget() {
       if (optionalAutotuneRamBudgetCase_ == 5) {
-        return (java.lang.Integer) optionalAutotuneRamBudget_;
+        return (java.lang.Long) optionalAutotuneRamBudget_;
       }
-      return 0;
+      return 0L;
     }
     /**
-     * <code>int32 autotune_ram_budget = 5;</code>
+     * <code>int64 autotune_ram_budget = 5;</code>
      */
-    public Builder setAutotuneRamBudget(int value) {
+    public Builder setAutotuneRamBudget(long value) {
       optionalAutotuneRamBudgetCase_ = 5;
       optionalAutotuneRamBudget_ = value;
       onChanged();
       return this;
     }
     /**
-     * <code>int32 autotune_ram_budget = 5;</code>
+     * <code>int64 autotune_ram_budget = 5;</code>
      */
     public Builder clearAutotuneRamBudget() {
       if (optionalAutotuneRamBudgetCase_ == 5) {
@@ -2363,66 +1961,6 @@ public Builder clearFilterFusion() {
       return this;
     }
 
-    /**
-     * <code>bool filter_with_random_uniform_fusion = 7;</code>
-     */
-    public boolean getFilterWithRandomUniformFusion() {
-      if (optionalFilterWithRandomUniformFusionCase_ == 7) {
-        return (java.lang.Boolean) optionalFilterWithRandomUniformFusion_;
-      }
-      return false;
-    }
-    /**
-     * <code>bool filter_with_random_uniform_fusion = 7;</code>
-     */
-    public Builder setFilterWithRandomUniformFusion(boolean value) {
-      optionalFilterWithRandomUniformFusionCase_ = 7;
-      optionalFilterWithRandomUniformFusion_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool filter_with_random_uniform_fusion = 7;</code>
-     */
-    public Builder clearFilterWithRandomUniformFusion() {
-      if (optionalFilterWithRandomUniformFusionCase_ == 7) {
-        optionalFilterWithRandomUniformFusionCase_ = 0;
-        optionalFilterWithRandomUniformFusion_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
-    /**
-     * <code>bool hoist_random_uniform = 8;</code>
-     */
-    public boolean getHoistRandomUniform() {
-      if (optionalHoistRandomUniformCase_ == 8) {
-        return (java.lang.Boolean) optionalHoistRandomUniform_;
-      }
-      return false;
-    }
-    /**
-     * <code>bool hoist_random_uniform = 8;</code>
-     */
-    public Builder setHoistRandomUniform(boolean value) {
-      optionalHoistRandomUniformCase_ = 8;
-      optionalHoistRandomUniform_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool hoist_random_uniform = 8;</code>
-     */
-    public Builder clearHoistRandomUniform() {
-      if (optionalHoistRandomUniformCase_ == 8) {
-        optionalHoistRandomUniformCase_ = 0;
-        optionalHoistRandomUniform_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
     /**
      * <code>bool map_and_batch_fusion = 9;</code>
      */
@@ -2543,159 +2081,6 @@ public Builder clearMapParallelization() {
       return this;
     }
 
-    private org.tensorflow.proto.data.MapVectorization mapVectorization_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        org.tensorflow.proto.data.MapVectorization, org.tensorflow.proto.data.MapVectorization.Builder, org.tensorflow.proto.data.MapVectorizationOrBuilder> mapVectorizationBuilder_;
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    public boolean hasMapVectorization() {
-      return mapVectorizationBuilder_ != null || mapVectorization_ != null;
-    }
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    public org.tensorflow.proto.data.MapVectorization getMapVectorization() {
-      if (mapVectorizationBuilder_ == null) {
-        return mapVectorization_ == null ? org.tensorflow.proto.data.MapVectorization.getDefaultInstance() : mapVectorization_;
-      } else {
-        return mapVectorizationBuilder_.getMessage();
-      }
-    }
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    public Builder setMapVectorization(org.tensorflow.proto.data.MapVectorization value) {
-      if (mapVectorizationBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        mapVectorization_ = value;
-        onChanged();
-      } else {
-        mapVectorizationBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    public Builder setMapVectorization(
-        org.tensorflow.proto.data.MapVectorization.Builder builderForValue) {
-      if (mapVectorizationBuilder_ == null) {
-        mapVectorization_ = builderForValue.build();
-        onChanged();
-      } else {
-        mapVectorizationBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    public Builder mergeMapVectorization(org.tensorflow.proto.data.MapVectorization value) {
-      if (mapVectorizationBuilder_ == null) {
-        if (mapVectorization_ != null) {
-          mapVectorization_ =
-            org.tensorflow.proto.data.MapVectorization.newBuilder(mapVectorization_).mergeFrom(value).buildPartial();
-        } else {
-          mapVectorization_ = value;
-        }
-        onChanged();
-      } else {
-        mapVectorizationBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    public Builder clearMapVectorization() {
-      if (mapVectorizationBuilder_ == null) {
-        mapVectorization_ = null;
-        onChanged();
-      } else {
-        mapVectorization_ = null;
-        mapVectorizationBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    public org.tensorflow.proto.data.MapVectorization.Builder getMapVectorizationBuilder() {
-      
-      onChanged();
-      return getMapVectorizationFieldBuilder().getBuilder();
-    }
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    public org.tensorflow.proto.data.MapVectorizationOrBuilder getMapVectorizationOrBuilder() {
-      if (mapVectorizationBuilder_ != null) {
-        return mapVectorizationBuilder_.getMessageOrBuilder();
-      } else {
-        return mapVectorization_ == null ?
-            org.tensorflow.proto.data.MapVectorization.getDefaultInstance() : mapVectorization_;
-      }
-    }
-    /**
-     * <pre>
-     * The map vectorization options associated with the dataset.
-     * </pre>
-     *
-     * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        org.tensorflow.proto.data.MapVectorization, org.tensorflow.proto.data.MapVectorization.Builder, org.tensorflow.proto.data.MapVectorizationOrBuilder> 
-        getMapVectorizationFieldBuilder() {
-      if (mapVectorizationBuilder_ == null) {
-        mapVectorizationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.tensorflow.proto.data.MapVectorization, org.tensorflow.proto.data.MapVectorization.Builder, org.tensorflow.proto.data.MapVectorizationOrBuilder>(
-                getMapVectorization(),
-                getParentForChildren(),
-                isClean());
-        mapVectorization_ = null;
-      }
-      return mapVectorizationBuilder_;
-    }
-
     /**
      * <code>bool noop_elimination = 14;</code>
      */
@@ -2756,36 +2141,6 @@ public Builder clearParallelBatch() {
       return this;
     }
 
-    /**
-     * <code>bool reorder_data_discarding_ops = 16;</code>
-     */
-    public boolean getReorderDataDiscardingOps() {
-      if (optionalReorderDataDiscardingOpsCase_ == 16) {
-        return (java.lang.Boolean) optionalReorderDataDiscardingOps_;
-      }
-      return false;
-    }
-    /**
-     * <code>bool reorder_data_discarding_ops = 16;</code>
-     */
-    public Builder setReorderDataDiscardingOps(boolean value) {
-      optionalReorderDataDiscardingOpsCase_ = 16;
-      optionalReorderDataDiscardingOps_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>bool reorder_data_discarding_ops = 16;</code>
-     */
-    public Builder clearReorderDataDiscardingOps() {
-      if (optionalReorderDataDiscardingOpsCase_ == 16) {
-        optionalReorderDataDiscardingOpsCase_ = 0;
-        optionalReorderDataDiscardingOps_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
     /**
      * <code>bool shuffle_and_repeat_fusion = 17;</code>
      */
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/OptimizationOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/OptimizationOptionsOrBuilder.java
index 2197a9617fa..ac861c4710b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/OptimizationOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/OptimizationOptionsOrBuilder.java
@@ -28,25 +28,15 @@ public interface OptimizationOptionsOrBuilder extends
   int getAutotuneCpuBudget();
 
   /**
-   * <code>int32 autotune_ram_budget = 5;</code>
+   * <code>int64 autotune_ram_budget = 5;</code>
    */
-  int getAutotuneRamBudget();
+  long getAutotuneRamBudget();
 
   /**
    * <code>bool filter_fusion = 6;</code>
    */
   boolean getFilterFusion();
 
-  /**
-   * <code>bool filter_with_random_uniform_fusion = 7;</code>
-   */
-  boolean getFilterWithRandomUniformFusion();
-
-  /**
-   * <code>bool hoist_random_uniform = 8;</code>
-   */
-  boolean getHoistRandomUniform();
-
   /**
    * <code>bool map_and_batch_fusion = 9;</code>
    */
@@ -67,31 +57,6 @@ public interface OptimizationOptionsOrBuilder extends
    */
   boolean getMapParallelization();
 
-  /**
-   * <pre>
-   * The map vectorization options associated with the dataset.
-   * </pre>
-   *
-   * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-   */
-  boolean hasMapVectorization();
-  /**
-   * <pre>
-   * The map vectorization options associated with the dataset.
-   * </pre>
-   *
-   * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-   */
-  org.tensorflow.proto.data.MapVectorization getMapVectorization();
-  /**
-   * <pre>
-   * The map vectorization options associated with the dataset.
-   * </pre>
-   *
-   * <code>.tensorflow.data.MapVectorization map_vectorization = 13;</code>
-   */
-  org.tensorflow.proto.data.MapVectorizationOrBuilder getMapVectorizationOrBuilder();
-
   /**
    * <code>bool noop_elimination = 14;</code>
    */
@@ -102,11 +67,6 @@ public interface OptimizationOptionsOrBuilder extends
    */
   boolean getParallelBatch();
 
-  /**
-   * <code>bool reorder_data_discarding_ops = 16;</code>
-   */
-  boolean getReorderDataDiscardingOps();
-
   /**
    * <code>bool shuffle_and_repeat_fusion = 17;</code>
    */
@@ -124,10 +84,6 @@ public interface OptimizationOptionsOrBuilder extends
 
   public org.tensorflow.proto.data.OptimizationOptions.OptionalFilterFusionCase getOptionalFilterFusionCase();
 
-  public org.tensorflow.proto.data.OptimizationOptions.OptionalFilterWithRandomUniformFusionCase getOptionalFilterWithRandomUniformFusionCase();
-
-  public org.tensorflow.proto.data.OptimizationOptions.OptionalHoistRandomUniformCase getOptionalHoistRandomUniformCase();
-
   public org.tensorflow.proto.data.OptimizationOptions.OptionalMapAndBatchFusionCase getOptionalMapAndBatchFusionCase();
 
   public org.tensorflow.proto.data.OptimizationOptions.OptionalMapAndFilterFusionCase getOptionalMapAndFilterFusionCase();
@@ -140,7 +96,5 @@ public interface OptimizationOptionsOrBuilder extends
 
   public org.tensorflow.proto.data.OptimizationOptions.OptionalParallelBatchCase getOptionalParallelBatchCase();
 
-  public org.tensorflow.proto.data.OptimizationOptions.OptionalReorderDataDiscardingOpsCase getOptionalReorderDataDiscardingOpsCase();
-
   public org.tensorflow.proto.data.OptimizationOptions.OptionalShuffleAndRepeatFusionCase getOptionalShuffleAndRepeatFusionCase();
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/experimental/ServiceConfig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/experimental/ServiceConfig.java
index 94ae5448669..3b49f356e2a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/experimental/ServiceConfig.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/experimental/ServiceConfig.java
@@ -88,7 +88,8 @@ public interface DispatcherConfigOrBuilder extends
     /**
      * <pre>
      * How long a job needs to be unused before it becomes a candidate for garbage
-     * collection.
+     * collection. A value of -1 indicates that jobs should never be garbage
+     * collected.
      * </pre>
      *
      * <code>int64 job_gc_timeout_ms = 6;</code>
@@ -342,7 +343,8 @@ public long getJobGcCheckIntervalMs() {
     /**
      * <pre>
      * How long a job needs to be unused before it becomes a candidate for garbage
-     * collection.
+     * collection. A value of -1 indicates that jobs should never be garbage
+     * collected.
      * </pre>
      *
      * <code>int64 job_gc_timeout_ms = 6;</code>
@@ -1053,7 +1055,8 @@ public Builder clearJobGcCheckIntervalMs() {
       /**
        * <pre>
        * How long a job needs to be unused before it becomes a candidate for garbage
-       * collection.
+       * collection. A value of -1 indicates that jobs should never be garbage
+       * collected.
        * </pre>
        *
        * <code>int64 job_gc_timeout_ms = 6;</code>
@@ -1064,7 +1067,8 @@ public long getJobGcTimeoutMs() {
       /**
        * <pre>
        * How long a job needs to be unused before it becomes a candidate for garbage
-       * collection.
+       * collection. A value of -1 indicates that jobs should never be garbage
+       * collected.
        * </pre>
        *
        * <code>int64 job_gc_timeout_ms = 6;</code>
@@ -1078,7 +1082,8 @@ public Builder setJobGcTimeoutMs(long value) {
       /**
        * <pre>
        * How long a job needs to be unused before it becomes a candidate for garbage
-       * collection.
+       * collection. A value of -1 indicates that jobs should never be garbage
+       * collected.
        * </pre>
        *
        * <code>int64 job_gc_timeout_ms = 6;</code>
@@ -1251,6 +1256,28 @@ public interface WorkerConfigOrBuilder extends
     com.google.protobuf.ByteString
         getDataTransferProtocolBytes();
 
+    /**
+     * <pre>
+     * The data transfer address of the worker server. The substring "%port%", if
+     * specified, will be replaced with the worker's bound port. This is useful
+     * when the port is set to `0`.
+     * </pre>
+     *
+     * <code>string data_transfer_address = 8;</code>
+     */
+    java.lang.String getDataTransferAddress();
+    /**
+     * <pre>
+     * The data transfer address of the worker server. The substring "%port%", if
+     * specified, will be replaced with the worker's bound port. This is useful
+     * when the port is set to `0`.
+     * </pre>
+     *
+     * <code>string data_transfer_address = 8;</code>
+     */
+    com.google.protobuf.ByteString
+        getDataTransferAddressBytes();
+
     /**
      * <pre>
      * When shutting down a worker, how long to wait for the gRPC server to
@@ -1283,6 +1310,7 @@ private WorkerConfig() {
       dispatcherAddress_ = "";
       workerAddress_ = "";
       dataTransferProtocol_ = "";
+      dataTransferAddress_ = "";
     }
 
     @java.lang.Override
@@ -1354,6 +1382,12 @@ private WorkerConfig(
               dataTransferProtocol_ = s;
               break;
             }
+            case 66: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              dataTransferAddress_ = s;
+              break;
+            }
             case 72: {
 
               shutdownQuietPeriodMs_ = input.readInt64();
@@ -1604,6 +1638,52 @@ public java.lang.String getDataTransferProtocol() {
       }
     }
 
+    public static final int DATA_TRANSFER_ADDRESS_FIELD_NUMBER = 8;
+    private volatile java.lang.Object dataTransferAddress_;
+    /**
+     * <pre>
+     * The data transfer address of the worker server. The substring "%port%", if
+     * specified, will be replaced with the worker's bound port. This is useful
+     * when the port is set to `0`.
+     * </pre>
+     *
+     * <code>string data_transfer_address = 8;</code>
+     */
+    public java.lang.String getDataTransferAddress() {
+      java.lang.Object ref = dataTransferAddress_;
+      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();
+        dataTransferAddress_ = s;
+        return s;
+      }
+    }
+    /**
+     * <pre>
+     * The data transfer address of the worker server. The substring "%port%", if
+     * specified, will be replaced with the worker's bound port. This is useful
+     * when the port is set to `0`.
+     * </pre>
+     *
+     * <code>string data_transfer_address = 8;</code>
+     */
+    public com.google.protobuf.ByteString
+        getDataTransferAddressBytes() {
+      java.lang.Object ref = dataTransferAddress_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        dataTransferAddress_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     public static final int SHUTDOWN_QUIET_PERIOD_MS_FIELD_NUMBER = 9;
     private long shutdownQuietPeriodMs_;
     /**
@@ -1654,6 +1734,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (!getDataTransferProtocolBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 7, dataTransferProtocol_);
       }
+      if (!getDataTransferAddressBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, dataTransferAddress_);
+      }
       if (shutdownQuietPeriodMs_ != 0L) {
         output.writeInt64(9, shutdownQuietPeriodMs_);
       }
@@ -1690,6 +1773,9 @@ public int getSerializedSize() {
       if (!getDataTransferProtocolBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, dataTransferProtocol_);
       }
+      if (!getDataTransferAddressBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, dataTransferAddress_);
+      }
       if (shutdownQuietPeriodMs_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(9, shutdownQuietPeriodMs_);
@@ -1723,6 +1809,8 @@ public boolean equals(final java.lang.Object obj) {
           != other.getDispatcherTimeoutMs()) return false;
       if (!getDataTransferProtocol()
           .equals(other.getDataTransferProtocol())) return false;
+      if (!getDataTransferAddress()
+          .equals(other.getDataTransferAddress())) return false;
       if (getShutdownQuietPeriodMs()
           != other.getShutdownQuietPeriodMs()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -1753,6 +1841,8 @@ public int hashCode() {
           getDispatcherTimeoutMs());
       hash = (37 * hash) + DATA_TRANSFER_PROTOCOL_FIELD_NUMBER;
       hash = (53 * hash) + getDataTransferProtocol().hashCode();
+      hash = (37 * hash) + DATA_TRANSFER_ADDRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getDataTransferAddress().hashCode();
       hash = (37 * hash) + SHUTDOWN_QUIET_PERIOD_MS_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getShutdownQuietPeriodMs());
@@ -1907,6 +1997,8 @@ public Builder clear() {
 
         dataTransferProtocol_ = "";
 
+        dataTransferAddress_ = "";
+
         shutdownQuietPeriodMs_ = 0L;
 
         return this;
@@ -1942,6 +2034,7 @@ public org.tensorflow.proto.data.experimental.ServiceConfig.WorkerConfig buildPa
         result.heartbeatIntervalMs_ = heartbeatIntervalMs_;
         result.dispatcherTimeoutMs_ = dispatcherTimeoutMs_;
         result.dataTransferProtocol_ = dataTransferProtocol_;
+        result.dataTransferAddress_ = dataTransferAddress_;
         result.shutdownQuietPeriodMs_ = shutdownQuietPeriodMs_;
         onBuilt();
         return result;
@@ -2016,6 +2109,10 @@ public Builder mergeFrom(org.tensorflow.proto.data.experimental.ServiceConfig.Wo
           dataTransferProtocol_ = other.dataTransferProtocol_;
           onChanged();
         }
+        if (!other.getDataTransferAddress().isEmpty()) {
+          dataTransferAddress_ = other.dataTransferAddress_;
+          onChanged();
+        }
         if (other.getShutdownQuietPeriodMs() != 0L) {
           setShutdownQuietPeriodMs(other.getShutdownQuietPeriodMs());
         }
@@ -2534,6 +2631,105 @@ public Builder setDataTransferProtocolBytes(
         return this;
       }
 
+      private java.lang.Object dataTransferAddress_ = "";
+      /**
+       * <pre>
+       * The data transfer address of the worker server. The substring "%port%", if
+       * specified, will be replaced with the worker's bound port. This is useful
+       * when the port is set to `0`.
+       * </pre>
+       *
+       * <code>string data_transfer_address = 8;</code>
+       */
+      public java.lang.String getDataTransferAddress() {
+        java.lang.Object ref = dataTransferAddress_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          dataTransferAddress_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <pre>
+       * The data transfer address of the worker server. The substring "%port%", if
+       * specified, will be replaced with the worker's bound port. This is useful
+       * when the port is set to `0`.
+       * </pre>
+       *
+       * <code>string data_transfer_address = 8;</code>
+       */
+      public com.google.protobuf.ByteString
+          getDataTransferAddressBytes() {
+        java.lang.Object ref = dataTransferAddress_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          dataTransferAddress_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <pre>
+       * The data transfer address of the worker server. The substring "%port%", if
+       * specified, will be replaced with the worker's bound port. This is useful
+       * when the port is set to `0`.
+       * </pre>
+       *
+       * <code>string data_transfer_address = 8;</code>
+       */
+      public Builder setDataTransferAddress(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        dataTransferAddress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * The data transfer address of the worker server. The substring "%port%", if
+       * specified, will be replaced with the worker's bound port. This is useful
+       * when the port is set to `0`.
+       * </pre>
+       *
+       * <code>string data_transfer_address = 8;</code>
+       */
+      public Builder clearDataTransferAddress() {
+        
+        dataTransferAddress_ = getDefaultInstance().getDataTransferAddress();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * The data transfer address of the worker server. The substring "%port%", if
+       * specified, will be replaced with the worker's bound port. This is useful
+       * when the port is set to `0`.
+       * </pre>
+       *
+       * <code>string data_transfer_address = 8;</code>
+       */
+      public Builder setDataTransferAddressBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        dataTransferAddress_ = value;
+        onChanged();
+        return this;
+      }
+
       private long shutdownQuietPeriodMs_ ;
       /**
        * <pre>
@@ -2654,14 +2850,17 @@ public org.tensorflow.proto.data.experimental.ServiceConfig.WorkerConfig getDefa
       "\n\020DispatcherConfig\022\014\n\004port\030\001 \001(\003\022\020\n\010prot" +
       "ocol\030\002 \001(\t\022\020\n\010work_dir\030\003 \001(\t\022\033\n\023fault_to" +
       "lerant_mode\030\004 \001(\010\022 \n\030job_gc_check_interv" +
-      "al_ms\030\005 \001(\003\022\031\n\021job_gc_timeout_ms\030\006 \001(\003\"\342" +
-      "\001\n\014WorkerConfig\022\014\n\004port\030\001 \001(\003\022\020\n\010protoco" +
+      "al_ms\030\005 \001(\003\022\031\n\021job_gc_timeout_ms\030\006 \001(\003\"\201" +
+      "\002\n\014WorkerConfig\022\014\n\004port\030\001 \001(\003\022\020\n\010protoco" +
       "l\030\002 \001(\t\022\032\n\022dispatcher_address\030\003 \001(\t\022\026\n\016w" +
       "orker_address\030\004 \001(\t\022\035\n\025heartbeat_interva" +
       "l_ms\030\005 \001(\003\022\035\n\025dispatcher_timeout_ms\030\006 \001(" +
-      "\003\022\036\n\026data_transfer_protocol\030\007 \001(\t\022 \n\030shu" +
-      "tdown_quiet_period_ms\030\t \001(\003B(\n&org.tenso" +
-      "rflow.proto.data.experimentalb\006proto3"
+      "\003\022\036\n\026data_transfer_protocol\030\007 \001(\t\022\035\n\025dat" +
+      "a_transfer_address\030\010 \001(\t\022 \n\030shutdown_qui" +
+      "et_period_ms\030\t \001(\003B\177\n&org.tensorflow.pro" +
+      "to.data.experimentalZUgithub.com/tensorf" +
+      "low/tensorflow/tensorflow/go/core/protob" +
+      "uf/for_core_protos_go_protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2678,7 +2877,7 @@ public org.tensorflow.proto.data.experimental.ServiceConfig.WorkerConfig getDefa
     internal_static_tensorflow_data_experimental_WorkerConfig_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_data_experimental_WorkerConfig_descriptor,
-        new java.lang.String[] { "Port", "Protocol", "DispatcherAddress", "WorkerAddress", "HeartbeatIntervalMs", "DispatcherTimeoutMs", "DataTransferProtocol", "ShutdownQuietPeriodMs", });
+        new java.lang.String[] { "Port", "Protocol", "DispatcherAddress", "WorkerAddress", "HeartbeatIntervalMs", "DispatcherTimeoutMs", "DataTransferProtocol", "DataTransferAddress", "ShutdownQuietPeriodMs", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/experimental/SnapshotProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/experimental/SnapshotProtos.java
index 289d5308ec9..57577a9ad7d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/experimental/SnapshotProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/experimental/SnapshotProtos.java
@@ -58,9 +58,11 @@ public static void registerAllExtensions(
       "(\0132\034.tensorflow.TensorShapeProto\022\031\n\021tens" +
       "or_size_bytes\030\003 \001(\003\"_\n\026SnapshotTensorMet" +
       "adata\022E\n\017tensor_metadata\030\001 \003(\0132,.tensorf" +
-      "low.data.experimental.TensorMetadataB:\n&" +
-      "org.tensorflow.proto.data.experimentalB\016" +
-      "SnapshotProtosP\001b\006proto3"
+      "low.data.experimental.TensorMetadataB\221\001\n" +
+      "&org.tensorflow.proto.data.experimentalB" +
+      "\016SnapshotProtosP\001ZUgithub.com/tensorflow" +
+      "/tensorflow/tensorflow/go/core/protobuf/" +
+      "for_core_protos_go_protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/model/ModelProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/model/ModelProtos.java
index 61b8c103012..b1bb7add402 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/model/ModelProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/data/model/ModelProtos.java
@@ -73,9 +73,11 @@ public static void registerAllExtensions(
       "NY\020\001\022\031\n\025ASYNC_INTERLEAVE_MANY\020\002\022\017\n\013KNOWN" +
       "_RATIO\020\003\022\025\n\021ASYNC_KNOWN_RATIO\020\004\022\021\n\rUNKNO" +
       "WN_RATIO\020\005*9\n\021AutotuneAlgorithm\022\016\n\nHILL_" +
-      "CLIMB\020\000\022\024\n\020GRADIENT_DESCENT\020\001B3\n\037org.ten" +
-      "sorflow.proto.data.modelB\013ModelProtosP\001\370" +
-      "\001\001b\006proto3"
+      "CLIMB\020\000\022\024\n\020GRADIENT_DESCENT\020\001B\201\001\n\037org.te" +
+      "nsorflow.proto.data.modelB\013ModelProtosP\001" +
+      "ZLgithub.com/tensorflow/tensorflow/tenso" +
+      "rflow/go/core/framework/model_go_proto\370\001" +
+      "\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CapturedTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CapturedTensor.java
new file mode 100644
index 00000000000..1208e25ad7b
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CapturedTensor.java
@@ -0,0 +1,729 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tensorflow/core/protobuf/saved_object_graph.proto
+
+package org.tensorflow.proto.framework;
+
+/**
+ * Protobuf type {@code tensorflow.CapturedTensor}
+ */
+public  final class CapturedTensor extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:tensorflow.CapturedTensor)
+    CapturedTensorOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use CapturedTensor.newBuilder() to construct.
+  private CapturedTensor(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private CapturedTensor() {
+    name_ = "";
+    concreteFunction_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new CapturedTensor();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private CapturedTensor(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            concreteFunction_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return org.tensorflow.proto.framework.SavedObjectGraphProtos.internal_static_tensorflow_CapturedTensor_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return org.tensorflow.proto.framework.SavedObjectGraphProtos.internal_static_tensorflow_CapturedTensor_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.tensorflow.proto.framework.CapturedTensor.class, org.tensorflow.proto.framework.CapturedTensor.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * <pre>
+   * Name of captured tensor
+   * </pre>
+   *
+   * <code>string name = 1;</code>
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    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();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * Name of captured tensor
+   * </pre>
+   *
+   * <code>string name = 1;</code>
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int CONCRETE_FUNCTION_FIELD_NUMBER = 2;
+  private volatile java.lang.Object concreteFunction_;
+  /**
+   * <pre>
+   * Name of concrete function which contains the computed graph tensor.
+   * </pre>
+   *
+   * <code>string concrete_function = 2;</code>
+   */
+  public java.lang.String getConcreteFunction() {
+    java.lang.Object ref = concreteFunction_;
+    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();
+      concreteFunction_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * Name of concrete function which contains the computed graph tensor.
+   * </pre>
+   *
+   * <code>string concrete_function = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getConcreteFunctionBytes() {
+    java.lang.Object ref = concreteFunction_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      concreteFunction_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (!getConcreteFunctionBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, concreteFunction_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (!getConcreteFunctionBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, concreteFunction_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof org.tensorflow.proto.framework.CapturedTensor)) {
+      return super.equals(obj);
+    }
+    org.tensorflow.proto.framework.CapturedTensor other = (org.tensorflow.proto.framework.CapturedTensor) obj;
+
+    if (!getName()
+        .equals(other.getName())) return false;
+    if (!getConcreteFunction()
+        .equals(other.getConcreteFunction())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + CONCRETE_FUNCTION_FIELD_NUMBER;
+    hash = (53 * hash) + getConcreteFunction().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.CapturedTensor parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.tensorflow.proto.framework.CapturedTensor prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code tensorflow.CapturedTensor}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:tensorflow.CapturedTensor)
+      org.tensorflow.proto.framework.CapturedTensorOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.tensorflow.proto.framework.SavedObjectGraphProtos.internal_static_tensorflow_CapturedTensor_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.tensorflow.proto.framework.SavedObjectGraphProtos.internal_static_tensorflow_CapturedTensor_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.tensorflow.proto.framework.CapturedTensor.class, org.tensorflow.proto.framework.CapturedTensor.Builder.class);
+    }
+
+    // Construct using org.tensorflow.proto.framework.CapturedTensor.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      concreteFunction_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return org.tensorflow.proto.framework.SavedObjectGraphProtos.internal_static_tensorflow_CapturedTensor_descriptor;
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.CapturedTensor getDefaultInstanceForType() {
+      return org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.CapturedTensor build() {
+      org.tensorflow.proto.framework.CapturedTensor result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.CapturedTensor buildPartial() {
+      org.tensorflow.proto.framework.CapturedTensor result = new org.tensorflow.proto.framework.CapturedTensor(this);
+      result.name_ = name_;
+      result.concreteFunction_ = concreteFunction_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof org.tensorflow.proto.framework.CapturedTensor) {
+        return mergeFrom((org.tensorflow.proto.framework.CapturedTensor)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(org.tensorflow.proto.framework.CapturedTensor other) {
+      if (other == org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (!other.getConcreteFunction().isEmpty()) {
+        concreteFunction_ = other.concreteFunction_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      org.tensorflow.proto.framework.CapturedTensor parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (org.tensorflow.proto.framework.CapturedTensor) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * <pre>
+     * Name of captured tensor
+     * </pre>
+     *
+     * <code>string name = 1;</code>
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * Name of captured tensor
+     * </pre>
+     *
+     * <code>string name = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * Name of captured tensor
+     * </pre>
+     *
+     * <code>string name = 1;</code>
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Name of captured tensor
+     * </pre>
+     *
+     * <code>string name = 1;</code>
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Name of captured tensor
+     * </pre>
+     *
+     * <code>string name = 1;</code>
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object concreteFunction_ = "";
+    /**
+     * <pre>
+     * Name of concrete function which contains the computed graph tensor.
+     * </pre>
+     *
+     * <code>string concrete_function = 2;</code>
+     */
+    public java.lang.String getConcreteFunction() {
+      java.lang.Object ref = concreteFunction_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        concreteFunction_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * Name of concrete function which contains the computed graph tensor.
+     * </pre>
+     *
+     * <code>string concrete_function = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getConcreteFunctionBytes() {
+      java.lang.Object ref = concreteFunction_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        concreteFunction_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * Name of concrete function which contains the computed graph tensor.
+     * </pre>
+     *
+     * <code>string concrete_function = 2;</code>
+     */
+    public Builder setConcreteFunction(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      concreteFunction_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Name of concrete function which contains the computed graph tensor.
+     * </pre>
+     *
+     * <code>string concrete_function = 2;</code>
+     */
+    public Builder clearConcreteFunction() {
+      
+      concreteFunction_ = getDefaultInstance().getConcreteFunction();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Name of concrete function which contains the computed graph tensor.
+     * </pre>
+     *
+     * <code>string concrete_function = 2;</code>
+     */
+    public Builder setConcreteFunctionBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      concreteFunction_ = value;
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:tensorflow.CapturedTensor)
+  }
+
+  // @@protoc_insertion_point(class_scope:tensorflow.CapturedTensor)
+  private static final org.tensorflow.proto.framework.CapturedTensor DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.tensorflow.proto.framework.CapturedTensor();
+  }
+
+  public static org.tensorflow.proto.framework.CapturedTensor getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<CapturedTensor>
+      PARSER = new com.google.protobuf.AbstractParser<CapturedTensor>() {
+    @java.lang.Override
+    public CapturedTensor parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CapturedTensor(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<CapturedTensor> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<CapturedTensor> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.tensorflow.proto.framework.CapturedTensor getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CapturedTensorOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CapturedTensorOrBuilder.java
new file mode 100644
index 00000000000..0efef800399
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CapturedTensorOrBuilder.java
@@ -0,0 +1,45 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tensorflow/core/protobuf/saved_object_graph.proto
+
+package org.tensorflow.proto.framework;
+
+public interface CapturedTensorOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:tensorflow.CapturedTensor)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * Name of captured tensor
+   * </pre>
+   *
+   * <code>string name = 1;</code>
+   */
+  java.lang.String getName();
+  /**
+   * <pre>
+   * Name of captured tensor
+   * </pre>
+   *
+   * <code>string name = 1;</code>
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * <pre>
+   * Name of concrete function which contains the computed graph tensor.
+   * </pre>
+   *
+   * <code>string concrete_function = 2;</code>
+   */
+  java.lang.String getConcreteFunction();
+  /**
+   * <pre>
+   * Name of concrete function which contains the computed graph tensor.
+   * </pre>
+   *
+   * <code>string concrete_function = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getConcreteFunctionBytes();
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ExtensionTypeVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CompositeTensorVariant.java
similarity index 71%
rename from tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ExtensionTypeVariant.java
rename to tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CompositeTensorVariant.java
index 1afaca12ca1..2ccec36143b 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ExtensionTypeVariant.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/CompositeTensorVariant.java
@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: tensorflow/core/protobuf/extension_type_variant.proto
+// source: tensorflow/core/protobuf/composite_tensor_variant.proto
 
 package org.tensorflow.proto.framework;
 
-public final class ExtensionTypeVariant {
-  private ExtensionTypeVariant() {}
+public final class CompositeTensorVariant {
+  private CompositeTensorVariant() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -14,8 +14,8 @@ public static void registerAllExtensions(
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  public interface ExtensionTypeVariantMetadataOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:tensorflow.ExtensionTypeVariantMetadata)
+  public interface CompositeTensorVariantMetadataOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:tensorflow.CompositeTensorVariantMetadata)
       com.google.protobuf.MessageOrBuilder {
 
     /**
@@ -33,31 +33,31 @@ public interface ExtensionTypeVariantMetadataOrBuilder extends
   }
   /**
    * <pre>
-   * Metadata for ExtensionTypeVariant, used when serializing as Variant.
+   * Metadata for CompositeTensorVariant, used when serializing as Variant.
    * We define a new message here (rather than directly using TypeSpecProto for
    * the metadata string) to retain flexibility to change the metadata encoding
    * to support additional features.
    * </pre>
    *
-   * Protobuf type {@code tensorflow.ExtensionTypeVariantMetadata}
+   * Protobuf type {@code tensorflow.CompositeTensorVariantMetadata}
    */
-  public  static final class ExtensionTypeVariantMetadata extends
+  public  static final class CompositeTensorVariantMetadata extends
       com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:tensorflow.ExtensionTypeVariantMetadata)
-      ExtensionTypeVariantMetadataOrBuilder {
+      // @@protoc_insertion_point(message_implements:tensorflow.CompositeTensorVariantMetadata)
+      CompositeTensorVariantMetadataOrBuilder {
   private static final long serialVersionUID = 0L;
-    // Use ExtensionTypeVariantMetadata.newBuilder() to construct.
-    private ExtensionTypeVariantMetadata(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    // Use CompositeTensorVariantMetadata.newBuilder() to construct.
+    private CompositeTensorVariantMetadata(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
-    private ExtensionTypeVariantMetadata() {
+    private CompositeTensorVariantMetadata() {
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
         UnusedPrivateParameter unused) {
-      return new ExtensionTypeVariantMetadata();
+      return new CompositeTensorVariantMetadata();
     }
 
     @java.lang.Override
@@ -65,7 +65,7 @@ protected java.lang.Object newInstance(
     getUnknownFields() {
       return this.unknownFields;
     }
-    private ExtensionTypeVariantMetadata(
+    private CompositeTensorVariantMetadata(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -117,15 +117,15 @@ private ExtensionTypeVariantMetadata(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tensorflow.proto.framework.ExtensionTypeVariant.internal_static_tensorflow_ExtensionTypeVariantMetadata_descriptor;
+      return org.tensorflow.proto.framework.CompositeTensorVariant.internal_static_tensorflow_CompositeTensorVariantMetadata_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tensorflow.proto.framework.ExtensionTypeVariant.internal_static_tensorflow_ExtensionTypeVariantMetadata_fieldAccessorTable
+      return org.tensorflow.proto.framework.CompositeTensorVariant.internal_static_tensorflow_CompositeTensorVariantMetadata_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata.class, org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata.Builder.class);
+              org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata.class, org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata.Builder.class);
     }
 
     public static final int TYPE_SPEC_PROTO_FIELD_NUMBER = 1;
@@ -189,10 +189,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata)) {
+      if (!(obj instanceof org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata)) {
         return super.equals(obj);
       }
-      org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata other = (org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata) obj;
+      org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata other = (org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata) obj;
 
       if (hasTypeSpecProto() != other.hasTypeSpecProto()) return false;
       if (hasTypeSpecProto()) {
@@ -219,69 +219,69 @@ public int hashCode() {
       return hash;
     }
 
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(byte[] data)
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(java.io.InputStream input)
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseDelimitedFrom(java.io.InputStream input)
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseDelimitedFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parseFrom(
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -294,7 +294,7 @@ public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeV
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata prototype) {
+    public static Builder newBuilder(org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -311,32 +311,32 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * Metadata for ExtensionTypeVariant, used when serializing as Variant.
+     * Metadata for CompositeTensorVariant, used when serializing as Variant.
      * We define a new message here (rather than directly using TypeSpecProto for
      * the metadata string) to retain flexibility to change the metadata encoding
      * to support additional features.
      * </pre>
      *
-     * Protobuf type {@code tensorflow.ExtensionTypeVariantMetadata}
+     * Protobuf type {@code tensorflow.CompositeTensorVariantMetadata}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:tensorflow.ExtensionTypeVariantMetadata)
-        org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadataOrBuilder {
+        // @@protoc_insertion_point(builder_implements:tensorflow.CompositeTensorVariantMetadata)
+        org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.tensorflow.proto.framework.ExtensionTypeVariant.internal_static_tensorflow_ExtensionTypeVariantMetadata_descriptor;
+        return org.tensorflow.proto.framework.CompositeTensorVariant.internal_static_tensorflow_CompositeTensorVariantMetadata_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.tensorflow.proto.framework.ExtensionTypeVariant.internal_static_tensorflow_ExtensionTypeVariantMetadata_fieldAccessorTable
+        return org.tensorflow.proto.framework.CompositeTensorVariant.internal_static_tensorflow_CompositeTensorVariantMetadata_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata.class, org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata.Builder.class);
+                org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata.class, org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata.Builder.class);
       }
 
-      // Construct using org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata.newBuilder()
+      // Construct using org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -366,17 +366,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.tensorflow.proto.framework.ExtensionTypeVariant.internal_static_tensorflow_ExtensionTypeVariantMetadata_descriptor;
+        return org.tensorflow.proto.framework.CompositeTensorVariant.internal_static_tensorflow_CompositeTensorVariantMetadata_descriptor;
       }
 
       @java.lang.Override
-      public org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata getDefaultInstanceForType() {
-        return org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata.getDefaultInstance();
+      public org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata getDefaultInstanceForType() {
+        return org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata build() {
-        org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata result = buildPartial();
+      public org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata build() {
+        org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -384,8 +384,8 @@ public org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantM
       }
 
       @java.lang.Override
-      public org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata buildPartial() {
-        org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata result = new org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata(this);
+      public org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata buildPartial() {
+        org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata result = new org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata(this);
         if (typeSpecProtoBuilder_ == null) {
           result.typeSpecProto_ = typeSpecProto_;
         } else {
@@ -429,16 +429,16 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata) {
-          return mergeFrom((org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata)other);
+        if (other instanceof org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata) {
+          return mergeFrom((org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata other) {
-        if (other == org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata other) {
+        if (other == org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata.getDefaultInstance()) return this;
         if (other.hasTypeSpecProto()) {
           mergeTypeSpecProto(other.getTypeSpecProto());
         }
@@ -457,11 +457,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata parsedMessage = null;
+        org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata) e.getUnfinishedMessage();
+          parsedMessage = (org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -600,51 +600,51 @@ public final Builder mergeUnknownFields(
       }
 
 
-      // @@protoc_insertion_point(builder_scope:tensorflow.ExtensionTypeVariantMetadata)
+      // @@protoc_insertion_point(builder_scope:tensorflow.CompositeTensorVariantMetadata)
     }
 
-    // @@protoc_insertion_point(class_scope:tensorflow.ExtensionTypeVariantMetadata)
-    private static final org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:tensorflow.CompositeTensorVariantMetadata)
+    private static final org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata();
+      DEFAULT_INSTANCE = new org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata();
     }
 
-    public static org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata getDefaultInstance() {
+    public static org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser<ExtensionTypeVariantMetadata>
-        PARSER = new com.google.protobuf.AbstractParser<ExtensionTypeVariantMetadata>() {
+    private static final com.google.protobuf.Parser<CompositeTensorVariantMetadata>
+        PARSER = new com.google.protobuf.AbstractParser<CompositeTensorVariantMetadata>() {
       @java.lang.Override
-      public ExtensionTypeVariantMetadata parsePartialFrom(
+      public CompositeTensorVariantMetadata parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ExtensionTypeVariantMetadata(input, extensionRegistry);
+        return new CompositeTensorVariantMetadata(input, extensionRegistry);
       }
     };
 
-    public static com.google.protobuf.Parser<ExtensionTypeVariantMetadata> parser() {
+    public static com.google.protobuf.Parser<CompositeTensorVariantMetadata> parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<ExtensionTypeVariantMetadata> getParserForType() {
+    public com.google.protobuf.Parser<CompositeTensorVariantMetadata> getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantMetadata getDefaultInstanceForType() {
+    public org.tensorflow.proto.framework.CompositeTensorVariant.CompositeTensorVariantMetadata getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tensorflow_ExtensionTypeVariantMetadata_descriptor;
+    internal_static_tensorflow_CompositeTensorVariantMetadata_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tensorflow_ExtensionTypeVariantMetadata_fieldAccessorTable;
+      internal_static_tensorflow_CompositeTensorVariantMetadata_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -654,23 +654,26 @@ public org.tensorflow.proto.framework.ExtensionTypeVariant.ExtensionTypeVariantM
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n5tensorflow/core/protobuf/extension_typ" +
-      "e_variant.proto\022\ntensorflow\032%tensorflow/" +
-      "core/protobuf/struct.proto\"R\n\034ExtensionT" +
-      "ypeVariantMetadata\0222\n\017type_spec_proto\030\001 " +
-      "\001(\0132\031.tensorflow.TypeSpecProtoB \n\036org.te" +
-      "nsorflow.proto.frameworkb\006proto3"
+      "\n7tensorflow/core/protobuf/composite_ten" +
+      "sor_variant.proto\022\ntensorflow\032%tensorflo" +
+      "w/core/protobuf/struct.proto\"T\n\036Composit" +
+      "eTensorVariantMetadata\0222\n\017type_spec_prot" +
+      "o\030\001 \001(\0132\031.tensorflow.TypeSpecProtoBw\n\036or" +
+      "g.tensorflow.proto.frameworkZUgithub.com" +
+      "/tensorflow/tensorflow/tensorflow/go/cor" +
+      "e/protobuf/for_core_protos_go_protob\006pro" +
+      "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           org.tensorflow.proto.framework.StructProtos.getDescriptor(),
         });
-    internal_static_tensorflow_ExtensionTypeVariantMetadata_descriptor =
+    internal_static_tensorflow_CompositeTensorVariantMetadata_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_tensorflow_ExtensionTypeVariantMetadata_fieldAccessorTable = new
+    internal_static_tensorflow_CompositeTensorVariantMetadata_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tensorflow_ExtensionTypeVariantMetadata_descriptor,
+        internal_static_tensorflow_CompositeTensorVariantMetadata_descriptor,
         new java.lang.String[] { "TypeSpecProto", });
     org.tensorflow.proto.framework.StructProtos.getDescriptor();
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProto.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProto.java
index 0688a5ad541..989d2bbeeb3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProto.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProto.java
@@ -510,6 +510,38 @@ public interface ExperimentalOrBuilder extends
      * <code>bool use_tfrt = 18;</code>
      */
     boolean getUseTfrt();
+
+    /**
+     * <pre>
+     * Distributed coordination service to be enabled if set.
+     * Currently only effective in multi-client setup.
+     * </pre>
+     *
+     * <code>string coordination_service = 19;</code>
+     */
+    java.lang.String getCoordinationService();
+    /**
+     * <pre>
+     * Distributed coordination service to be enabled if set.
+     * Currently only effective in multi-client setup.
+     * </pre>
+     *
+     * <code>string coordination_service = 19;</code>
+     */
+    com.google.protobuf.ByteString
+        getCoordinationServiceBytes();
+
+    /**
+     * <pre>
+     * Whether the remote devices in the cluster should be fetched during setup
+     * of multi-client cluster. If enabled, the workers will run an extra device
+     * information exchange step during startup and the workers' EagerContexts
+     * will become aware of remote devices in the cluster as well.
+     * </pre>
+     *
+     * <code>bool fetch_remote_devices_in_multi_client = 20;</code>
+     */
+    boolean getFetchRemoteDevicesInMultiClient();
   }
   /**
    * <pre>
@@ -533,6 +565,7 @@ private Experimental() {
       collectiveGroupLeader_ = "";
       executorType_ = "";
       mlirBridgeRollout_ = 0;
+      coordinationService_ = "";
     }
 
     @java.lang.Override
@@ -661,6 +694,17 @@ private Experimental(
               useTfrt_ = input.readBool();
               break;
             }
+            case 154: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              coordinationService_ = s;
+              break;
+            }
+            case 160: {
+
+              fetchRemoteDevicesInMultiClient_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -1256,6 +1300,66 @@ public boolean getUseTfrt() {
       return useTfrt_;
     }
 
+    public static final int COORDINATION_SERVICE_FIELD_NUMBER = 19;
+    private volatile java.lang.Object coordinationService_;
+    /**
+     * <pre>
+     * Distributed coordination service to be enabled if set.
+     * Currently only effective in multi-client setup.
+     * </pre>
+     *
+     * <code>string coordination_service = 19;</code>
+     */
+    public java.lang.String getCoordinationService() {
+      java.lang.Object ref = coordinationService_;
+      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();
+        coordinationService_ = s;
+        return s;
+      }
+    }
+    /**
+     * <pre>
+     * Distributed coordination service to be enabled if set.
+     * Currently only effective in multi-client setup.
+     * </pre>
+     *
+     * <code>string coordination_service = 19;</code>
+     */
+    public com.google.protobuf.ByteString
+        getCoordinationServiceBytes() {
+      java.lang.Object ref = coordinationService_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        coordinationService_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int FETCH_REMOTE_DEVICES_IN_MULTI_CLIENT_FIELD_NUMBER = 20;
+    private boolean fetchRemoteDevicesInMultiClient_;
+    /**
+     * <pre>
+     * Whether the remote devices in the cluster should be fetched during setup
+     * of multi-client cluster. If enabled, the workers will run an extra device
+     * information exchange step during startup and the workers' EagerContexts
+     * will become aware of remote devices in the cluster as well.
+     * </pre>
+     *
+     * <code>bool fetch_remote_devices_in_multi_client = 20;</code>
+     */
+    public boolean getFetchRemoteDevicesInMultiClient() {
+      return fetchRemoteDevicesInMultiClient_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1321,6 +1425,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (useTfrt_ != false) {
         output.writeBool(18, useTfrt_);
       }
+      if (!getCoordinationServiceBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 19, coordinationService_);
+      }
+      if (fetchRemoteDevicesInMultiClient_ != false) {
+        output.writeBool(20, fetchRemoteDevicesInMultiClient_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -1396,6 +1506,13 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(18, useTfrt_);
       }
+      if (!getCoordinationServiceBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(19, coordinationService_);
+      }
+      if (fetchRemoteDevicesInMultiClient_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(20, fetchRemoteDevicesInMultiClient_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1447,6 +1564,10 @@ public boolean equals(final java.lang.Object obj) {
           != other.getXlaFusionAutotunerThresh()) return false;
       if (getUseTfrt()
           != other.getUseTfrt()) return false;
+      if (!getCoordinationService()
+          .equals(other.getCoordinationService())) return false;
+      if (getFetchRemoteDevicesInMultiClient()
+          != other.getFetchRemoteDevicesInMultiClient()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1506,6 +1627,11 @@ public int hashCode() {
       hash = (37 * hash) + USE_TFRT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getUseTfrt());
+      hash = (37 * hash) + COORDINATION_SERVICE_FIELD_NUMBER;
+      hash = (53 * hash) + getCoordinationService().hashCode();
+      hash = (37 * hash) + FETCH_REMOTE_DEVICES_IN_MULTI_CLIENT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getFetchRemoteDevicesInMultiClient());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1683,6 +1809,10 @@ public Builder clear() {
 
         useTfrt_ = false;
 
+        coordinationService_ = "";
+
+        fetchRemoteDevicesInMultiClient_ = false;
+
         return this;
       }
 
@@ -1730,6 +1860,8 @@ public org.tensorflow.proto.framework.ConfigProto.Experimental buildPartial() {
         result.disableOutputPartitionGraphs_ = disableOutputPartitionGraphs_;
         result.xlaFusionAutotunerThresh_ = xlaFusionAutotunerThresh_;
         result.useTfrt_ = useTfrt_;
+        result.coordinationService_ = coordinationService_;
+        result.fetchRemoteDevicesInMultiClient_ = fetchRemoteDevicesInMultiClient_;
         onBuilt();
         return result;
       }
@@ -1831,6 +1963,13 @@ public Builder mergeFrom(org.tensorflow.proto.framework.ConfigProto.Experimental
         if (other.getUseTfrt() != false) {
           setUseTfrt(other.getUseTfrt());
         }
+        if (!other.getCoordinationService().isEmpty()) {
+          coordinationService_ = other.coordinationService_;
+          onChanged();
+        }
+        if (other.getFetchRemoteDevicesInMultiClient() != false) {
+          setFetchRemoteDevicesInMultiClient(other.getFetchRemoteDevicesInMultiClient());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -2941,6 +3080,147 @@ public Builder clearUseTfrt() {
         onChanged();
         return this;
       }
+
+      private java.lang.Object coordinationService_ = "";
+      /**
+       * <pre>
+       * Distributed coordination service to be enabled if set.
+       * Currently only effective in multi-client setup.
+       * </pre>
+       *
+       * <code>string coordination_service = 19;</code>
+       */
+      public java.lang.String getCoordinationService() {
+        java.lang.Object ref = coordinationService_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          coordinationService_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <pre>
+       * Distributed coordination service to be enabled if set.
+       * Currently only effective in multi-client setup.
+       * </pre>
+       *
+       * <code>string coordination_service = 19;</code>
+       */
+      public com.google.protobuf.ByteString
+          getCoordinationServiceBytes() {
+        java.lang.Object ref = coordinationService_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          coordinationService_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <pre>
+       * Distributed coordination service to be enabled if set.
+       * Currently only effective in multi-client setup.
+       * </pre>
+       *
+       * <code>string coordination_service = 19;</code>
+       */
+      public Builder setCoordinationService(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        coordinationService_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Distributed coordination service to be enabled if set.
+       * Currently only effective in multi-client setup.
+       * </pre>
+       *
+       * <code>string coordination_service = 19;</code>
+       */
+      public Builder clearCoordinationService() {
+        
+        coordinationService_ = getDefaultInstance().getCoordinationService();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Distributed coordination service to be enabled if set.
+       * Currently only effective in multi-client setup.
+       * </pre>
+       *
+       * <code>string coordination_service = 19;</code>
+       */
+      public Builder setCoordinationServiceBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        coordinationService_ = value;
+        onChanged();
+        return this;
+      }
+
+      private boolean fetchRemoteDevicesInMultiClient_ ;
+      /**
+       * <pre>
+       * Whether the remote devices in the cluster should be fetched during setup
+       * of multi-client cluster. If enabled, the workers will run an extra device
+       * information exchange step during startup and the workers' EagerContexts
+       * will become aware of remote devices in the cluster as well.
+       * </pre>
+       *
+       * <code>bool fetch_remote_devices_in_multi_client = 20;</code>
+       */
+      public boolean getFetchRemoteDevicesInMultiClient() {
+        return fetchRemoteDevicesInMultiClient_;
+      }
+      /**
+       * <pre>
+       * Whether the remote devices in the cluster should be fetched during setup
+       * of multi-client cluster. If enabled, the workers will run an extra device
+       * information exchange step during startup and the workers' EagerContexts
+       * will become aware of remote devices in the cluster as well.
+       * </pre>
+       *
+       * <code>bool fetch_remote_devices_in_multi_client = 20;</code>
+       */
+      public Builder setFetchRemoteDevicesInMultiClient(boolean value) {
+        
+        fetchRemoteDevicesInMultiClient_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Whether the remote devices in the cluster should be fetched during setup
+       * of multi-client cluster. If enabled, the workers will run an extra device
+       * information exchange step during startup and the workers' EagerContexts
+       * will become aware of remote devices in the cluster as well.
+       * </pre>
+       *
+       * <code>bool fetch_remote_devices_in_multi_client = 20;</code>
+       */
+      public Builder clearFetchRemoteDevicesInMultiClient() {
+        
+        fetchRemoteDevicesInMultiClient_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -3109,7 +3389,7 @@ public int getDeviceCountOrThrow(
    * then there is exactly one intra op thread pool per process.
    * The first session created determines the number of threads in this pool.
    * All subsequent sessions reuse/share this one global pool.
-   * There are notable exceptions to the default behavior describe above:
+   * There are notable exceptions to the default behavior described above:
    * 1. There is an environment variable  for overriding this thread pool,
    *    named TF_OVERRIDE_GLOBAL_THREADPOOL.
    * 2. When connecting to a server, such as a remote `tf.train.Server`
@@ -4515,7 +4795,7 @@ public Builder putAllDeviceCount(
      * then there is exactly one intra op thread pool per process.
      * The first session created determines the number of threads in this pool.
      * All subsequent sessions reuse/share this one global pool.
-     * There are notable exceptions to the default behavior describe above:
+     * There are notable exceptions to the default behavior described above:
      * 1. There is an environment variable  for overriding this thread pool,
      *    named TF_OVERRIDE_GLOBAL_THREADPOOL.
      * 2. When connecting to a server, such as a remote `tf.train.Server`
@@ -4536,7 +4816,7 @@ public int getIntraOpParallelismThreads() {
      * then there is exactly one intra op thread pool per process.
      * The first session created determines the number of threads in this pool.
      * All subsequent sessions reuse/share this one global pool.
-     * There are notable exceptions to the default behavior describe above:
+     * There are notable exceptions to the default behavior described above:
      * 1. There is an environment variable  for overriding this thread pool,
      *    named TF_OVERRIDE_GLOBAL_THREADPOOL.
      * 2. When connecting to a server, such as a remote `tf.train.Server`
@@ -4560,7 +4840,7 @@ public Builder setIntraOpParallelismThreads(int value) {
      * then there is exactly one intra op thread pool per process.
      * The first session created determines the number of threads in this pool.
      * All subsequent sessions reuse/share this one global pool.
-     * There are notable exceptions to the default behavior describe above:
+     * There are notable exceptions to the default behavior described above:
      * 1. There is an environment variable  for overriding this thread pool,
      *    named TF_OVERRIDE_GLOBAL_THREADPOOL.
      * 2. When connecting to a server, such as a remote `tf.train.Server`
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProtoOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProtoOrBuilder.java
index a13298b2bb5..3b83aa99dea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProtoOrBuilder.java
@@ -85,7 +85,7 @@ int getDeviceCountOrThrow(
    * then there is exactly one intra op thread pool per process.
    * The first session created determines the number of threads in this pool.
    * All subsequent sessions reuse/share this one global pool.
-   * There are notable exceptions to the default behavior describe above:
+   * There are notable exceptions to the default behavior described above:
    * 1. There is an environment variable  for overriding this thread pool,
    *    named TF_OVERRIDE_GLOBAL_THREADPOOL.
    * 2. When connecting to a server, such as a remote `tf.train.Server`
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProtos.java
index 2479ebdc921..c0bcb9ba644 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/ConfigProtos.java
@@ -130,7 +130,7 @@ public static void registerAllExtensions(
       "k/step_stats.proto\032&tensorflow/core/prot" +
       "obuf/cluster.proto\032$tensorflow/core/prot" +
       "obuf/debug.proto\032.tensorflow/core/protob" +
-      "uf/rewriter_config.proto\"\311\005\n\nGPUOptions\022" +
+      "uf/rewriter_config.proto\"\221\006\n\nGPUOptions\022" +
       "\'\n\037per_process_gpu_memory_fraction\030\001 \001(\001" +
       "\022\024\n\014allow_growth\030\004 \001(\010\022\026\n\016allocator_type" +
       "\030\002 \001(\t\022\037\n\027deferred_deletion_bytes\030\003 \001(\003\022" +
@@ -138,7 +138,7 @@ public static void registerAllExtensions(
       "active_delay_usecs\030\006 \001(\005\022$\n\034polling_inac" +
       "tive_delay_msecs\030\007 \001(\005\022\034\n\024force_gpu_comp" +
       "atible\030\010 \001(\010\0229\n\014experimental\030\t \001(\0132#.ten" +
-      "sorflow.GPUOptions.Experimental\032\202\003\n\014Expe" +
+      "sorflow.GPUOptions.Experimental\032\312\003\n\014Expe" +
       "rimental\022K\n\017virtual_devices\030\001 \003(\01322.tens" +
       "orflow.GPUOptions.Experimental.VirtualDe" +
       "vices\022\032\n\022use_unified_memory\030\002 \001(\010\022#\n\033num" +
@@ -146,119 +146,123 @@ public static void registerAllExtensions(
       "tive_ring_order\030\004 \001(\t\022\035\n\025timestamped_all" +
       "ocator\030\005 \001(\010\022#\n\033kernel_tracker_max_inter" +
       "val\030\007 \001(\005\022 \n\030kernel_tracker_max_bytes\030\010 " +
-      "\001(\005\022\"\n\032kernel_tracker_max_pending\030\t \001(\005\032" +
-      ";\n\016VirtualDevices\022\027\n\017memory_limit_mb\030\001 \003" +
-      "(\002\022\020\n\010priority\030\002 \003(\005\"\205\003\n\020OptimizerOption" +
-      "s\022+\n#do_common_subexpression_elimination" +
-      "\030\001 \001(\010\022\033\n\023do_constant_folding\030\002 \001(\010\022$\n\034m" +
-      "ax_folded_constant_in_bytes\030\006 \001(\003\022\034\n\024do_" +
-      "function_inlining\030\004 \001(\010\0225\n\topt_level\030\003 \001" +
-      "(\0162\".tensorflow.OptimizerOptions.Level\022E" +
-      "\n\020global_jit_level\030\005 \001(\0162+.tensorflow.Op" +
-      "timizerOptions.GlobalJitLevel\" \n\005Level\022\006" +
-      "\n\002L1\020\000\022\017\n\002L0\020\377\377\377\377\377\377\377\377\377\001\"C\n\016GlobalJitLeve" +
-      "l\022\013\n\007DEFAULT\020\000\022\020\n\003OFF\020\377\377\377\377\377\377\377\377\377\001\022\010\n\004ON_1" +
-      "\020\001\022\010\n\004ON_2\020\002\"\356\002\n\014GraphOptions\022\036\n\026enable_" +
-      "recv_scheduling\030\002 \001(\010\0227\n\021optimizer_optio" +
-      "ns\030\003 \001(\0132\034.tensorflow.OptimizerOptions\022\030" +
-      "\n\020build_cost_model\030\004 \001(\003\022\036\n\026build_cost_m" +
-      "odel_after\030\t \001(\003\022\024\n\014infer_shapes\030\005 \001(\010\022\032" +
-      "\n\022place_pruned_graph\030\006 \001(\010\022 \n\030enable_bfl" +
-      "oat16_sendrecv\030\007 \001(\010\022\025\n\rtimeline_step\030\010 " +
-      "\001(\005\0223\n\017rewrite_options\030\n \001(\0132\032.tensorflo" +
-      "w.RewriterConfigJ\004\010\001\020\002R%skip_common_sube" +
-      "xpression_elimination\"A\n\025ThreadPoolOptio" +
-      "nProto\022\023\n\013num_threads\030\001 \001(\005\022\023\n\013global_na" +
-      "me\030\002 \001(\t\"\264\001\n\nRPCOptions\022$\n\034use_rpc_for_i" +
-      "nprocess_master\030\001 \001(\010\022\035\n\025compression_alg" +
-      "orithm\030\002 \001(\t\022\031\n\021compression_level\030\003 \001(\005\022" +
-      "\032\n\022cache_rpc_response\030\004 \001(\010\022*\n\"disable_s" +
-      "ession_connection_sharing\030\005 \001(\010\"0\n\017Sessi" +
-      "onMetadata\022\014\n\004name\030\001 \001(\t\022\017\n\007version\030\002 \001(" +
-      "\003\"\214\r\n\013ConfigProto\022>\n\014device_count\030\001 \003(\0132" +
-      "(.tensorflow.ConfigProto.DeviceCountEntr" +
-      "y\022$\n\034intra_op_parallelism_threads\030\002 \001(\005\022" +
-      "$\n\034inter_op_parallelism_threads\030\005 \001(\005\022\037\n" +
-      "\027use_per_session_threads\030\t \001(\010\022G\n\034sessio" +
-      "n_inter_op_thread_pool\030\014 \003(\0132!.tensorflo" +
-      "w.ThreadPoolOptionProto\022\030\n\020placement_per" +
-      "iod\030\003 \001(\005\022\026\n\016device_filters\030\004 \003(\t\022+\n\013gpu" +
-      "_options\030\006 \001(\0132\026.tensorflow.GPUOptions\022\034" +
-      "\n\024allow_soft_placement\030\007 \001(\010\022\034\n\024log_devi" +
-      "ce_placement\030\010 \001(\010\022/\n\rgraph_options\030\n \001(" +
-      "\0132\030.tensorflow.GraphOptions\022\037\n\027operation" +
-      "_timeout_in_ms\030\013 \001(\003\022+\n\013rpc_options\030\r \001(" +
-      "\0132\026.tensorflow.RPCOptions\022+\n\013cluster_def" +
-      "\030\016 \001(\0132\026.tensorflow.ClusterDef\022\035\n\025isolat" +
-      "e_session_state\030\017 \001(\010\022(\n share_cluster_d" +
-      "evices_in_session\030\021 \001(\010\022:\n\014experimental\030" +
-      "\020 \001(\0132$.tensorflow.ConfigProto.Experimen" +
-      "tal\0322\n\020DeviceCountEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" +
-      "value\030\002 \001(\005:\0028\001\032\206\007\n\014Experimental\022\037\n\027coll" +
-      "ective_group_leader\030\001 \001(\t\022\025\n\rexecutor_ty" +
-      "pe\030\003 \001(\t\022\032\n\022recv_buf_max_chunk\030\004 \001(\005\022\031\n\021" +
-      "use_numa_affinity\030\005 \001(\010\0225\n-collective_de" +
-      "terministic_sequential_execution\030\006 \001(\010\022\027" +
-      "\n\017collective_nccl\030\007 \001(\010\0226\n.share_session" +
-      "_state_in_clusterspec_propagation\030\010 \001(\010\022" +
-      "\037\n\027disable_thread_spinning\030\t \001(\010\022(\n shar" +
-      "e_cluster_devices_in_session\030\n \001(\010\0225\n\020se" +
-      "ssion_metadata\030\013 \001(\0132\033.tensorflow.Sessio" +
-      "nMetadata\022!\n\031optimize_for_static_graph\030\014" +
-      " \001(\010\022\032\n\022enable_mlir_bridge\030\r \001(\010\022S\n\023mlir" +
-      "_bridge_rollout\030\021 \001(\01626.tensorflow.Confi" +
-      "gProto.Experimental.MlirBridgeRollout\022&\n" +
-      "\036enable_mlir_graph_optimization\030\020 \001(\010\022\'\n" +
-      "\037disable_output_partition_graphs\030\016 \001(\010\022#" +
-      "\n\033xla_fusion_autotuner_thresh\030\017 \001(\003\022\020\n\010u" +
-      "se_tfrt\030\022 \001(\010\"\332\001\n\021MlirBridgeRollout\022#\n\037M" +
-      "LIR_BRIDGE_ROLLOUT_UNSPECIFIED\020\000\022\037\n\033MLIR" +
-      "_BRIDGE_ROLLOUT_ENABLED\020\001\022 \n\034MLIR_BRIDGE" +
-      "_ROLLOUT_DISABLED\020\002\022)\n%MLIR_BRIDGE_ROLLO" +
-      "UT_SAFE_MODE_ENABLED\020\003\0222\n.MLIR_BRIDGE_RO" +
-      "LLOUT_SAFE_MODE_FALLBACK_ENABLED\020\004J\004\010\002\020\003" +
-      "\"\341\004\n\nRunOptions\0226\n\013trace_level\030\001 \001(\0162!.t" +
-      "ensorflow.RunOptions.TraceLevel\022\025\n\rtimeo" +
-      "ut_in_ms\030\002 \001(\003\022\034\n\024inter_op_thread_pool\030\003" +
-      " \001(\005\022\037\n\027output_partition_graphs\030\005 \001(\010\022/\n" +
-      "\rdebug_options\030\006 \001(\0132\030.tensorflow.DebugO" +
-      "ptions\022*\n\"report_tensor_allocations_upon" +
-      "_oom\030\007 \001(\010\0229\n\014experimental\030\010 \001(\0132#.tenso" +
-      "rflow.RunOptions.Experimental\032\322\001\n\014Experi" +
-      "mental\022\034\n\024collective_graph_key\030\001 \001(\003\022\034\n\024" +
-      "use_run_handler_pool\030\002 \001(\010\022[\n\030run_handle" +
-      "r_pool_options\030\003 \001(\01329.tensorflow.RunOpt" +
-      "ions.Experimental.RunHandlerPoolOptions\032" +
-      ")\n\025RunHandlerPoolOptions\022\020\n\010priority\030\001 \001" +
-      "(\003\"R\n\nTraceLevel\022\014\n\010NO_TRACE\020\000\022\022\n\016SOFTWA" +
-      "RE_TRACE\020\001\022\022\n\016HARDWARE_TRACE\020\002\022\016\n\nFULL_T" +
-      "RACE\020\003J\004\010\004\020\005\"\207\003\n\013RunMetadata\022)\n\nstep_sta" +
-      "ts\030\001 \001(\0132\025.tensorflow.StepStats\022,\n\ncost_" +
-      "graph\030\002 \001(\0132\030.tensorflow.CostGraphDef\022.\n" +
-      "\020partition_graphs\030\003 \003(\0132\024.tensorflow.Gra" +
-      "phDef\022?\n\017function_graphs\030\004 \003(\0132&.tensorf" +
-      "low.RunMetadata.FunctionGraphs\032\255\001\n\016Funct" +
-      "ionGraphs\022.\n\020partition_graphs\030\001 \003(\0132\024.te" +
-      "nsorflow.GraphDef\0224\n\026pre_optimization_gr" +
-      "aph\030\002 \001(\0132\024.tensorflow.GraphDef\0225\n\027post_" +
-      "optimization_graph\030\003 \001(\0132\024.tensorflow.Gr" +
-      "aphDef\":\n\020TensorConnection\022\023\n\013from_tenso" +
-      "r\030\001 \001(\t\022\021\n\tto_tensor\030\002 \001(\t\"\260\003\n\017CallableO" +
-      "ptions\022\014\n\004feed\030\001 \003(\t\022\r\n\005fetch\030\002 \003(\t\022\016\n\006t" +
-      "arget\030\003 \003(\t\022+\n\013run_options\030\004 \001(\0132\026.tenso" +
-      "rflow.RunOptions\0227\n\021tensor_connection\030\005 " +
-      "\003(\0132\034.tensorflow.TensorConnection\022B\n\014fee" +
-      "d_devices\030\006 \003(\0132,.tensorflow.CallableOpt" +
-      "ions.FeedDevicesEntry\022D\n\rfetch_devices\030\007" +
-      " \003(\0132-.tensorflow.CallableOptions.FetchD" +
-      "evicesEntry\022\027\n\017fetch_skip_sync\030\010 \001(\010\0322\n\020" +
-      "FeedDevicesEntry\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\005value\030\002 \001(\t:\0028\001B\212\001\n\036org.tensorflow" +
-      ".proto.frameworkB\014ConfigProtosP\001ZUgithub" +
-      ".com/tensorflow/tensorflow/tensorflow/go" +
-      "/core/protobuf/for_core_protos_go_proto\370" +
-      "\001\001b\006proto3"
+      "\001(\005\022\"\n\032kernel_tracker_max_pending\030\t \001(\005\022" +
+      "\'\n\037internal_fragmentation_fraction\030\n \001(\001" +
+      "\022\035\n\025use_cuda_malloc_async\030\013 \001(\010\032;\n\016Virtu" +
+      "alDevices\022\027\n\017memory_limit_mb\030\001 \003(\002\022\020\n\010pr" +
+      "iority\030\002 \003(\005\"\205\003\n\020OptimizerOptions\022+\n#do_" +
+      "common_subexpression_elimination\030\001 \001(\010\022\033" +
+      "\n\023do_constant_folding\030\002 \001(\010\022$\n\034max_folde" +
+      "d_constant_in_bytes\030\006 \001(\003\022\034\n\024do_function" +
+      "_inlining\030\004 \001(\010\0225\n\topt_level\030\003 \001(\0162\".ten" +
+      "sorflow.OptimizerOptions.Level\022E\n\020global" +
+      "_jit_level\030\005 \001(\0162+.tensorflow.OptimizerO" +
+      "ptions.GlobalJitLevel\" \n\005Level\022\006\n\002L1\020\000\022\017" +
+      "\n\002L0\020\377\377\377\377\377\377\377\377\377\001\"C\n\016GlobalJitLevel\022\013\n\007DEF" +
+      "AULT\020\000\022\020\n\003OFF\020\377\377\377\377\377\377\377\377\377\001\022\010\n\004ON_1\020\001\022\010\n\004ON" +
+      "_2\020\002\"\356\002\n\014GraphOptions\022\036\n\026enable_recv_sch" +
+      "eduling\030\002 \001(\010\0227\n\021optimizer_options\030\003 \001(\013" +
+      "2\034.tensorflow.OptimizerOptions\022\030\n\020build_" +
+      "cost_model\030\004 \001(\003\022\036\n\026build_cost_model_aft" +
+      "er\030\t \001(\003\022\024\n\014infer_shapes\030\005 \001(\010\022\032\n\022place_" +
+      "pruned_graph\030\006 \001(\010\022 \n\030enable_bfloat16_se" +
+      "ndrecv\030\007 \001(\010\022\025\n\rtimeline_step\030\010 \001(\005\0223\n\017r" +
+      "ewrite_options\030\n \001(\0132\032.tensorflow.Rewrit" +
+      "erConfigJ\004\010\001\020\002R%skip_common_subexpressio" +
+      "n_elimination\"A\n\025ThreadPoolOptionProto\022\023" +
+      "\n\013num_threads\030\001 \001(\005\022\023\n\013global_name\030\002 \001(\t" +
+      "\"\325\001\n\nRPCOptions\022$\n\034use_rpc_for_inprocess" +
+      "_master\030\001 \001(\010\022\035\n\025compression_algorithm\030\002" +
+      " \001(\t\022\031\n\021compression_level\030\003 \001(\005\022\032\n\022cache" +
+      "_rpc_response\030\004 \001(\010\022*\n\"disable_session_c" +
+      "onnection_sharing\030\005 \001(\010\022\037\n\027num_channels_" +
+      "per_target\030\006 \001(\005\"0\n\017SessionMetadata\022\014\n\004n" +
+      "ame\030\001 \001(\t\022\017\n\007version\030\002 \001(\003\"\330\r\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" +
+      "allelism_threads\030\005 \001(\005\022\037\n\027use_per_sessio" +
+      "n_threads\030\t \001(\010\022G\n\034session_inter_op_thre" +
+      "ad_pool\030\014 \003(\0132!.tensorflow.ThreadPoolOpt" +
+      "ionProto\022\030\n\020placement_period\030\003 \001(\005\022\026\n\016de" +
+      "vice_filters\030\004 \003(\t\022+\n\013gpu_options\030\006 \001(\0132" +
+      "\026.tensorflow.GPUOptions\022\034\n\024allow_soft_pl" +
+      "acement\030\007 \001(\010\022\034\n\024log_device_placement\030\010 " +
+      "\001(\010\022/\n\rgraph_options\030\n \001(\0132\030.tensorflow." +
+      "GraphOptions\022\037\n\027operation_timeout_in_ms\030" +
+      "\013 \001(\003\022+\n\013rpc_options\030\r \001(\0132\026.tensorflow." +
+      "RPCOptions\022+\n\013cluster_def\030\016 \001(\0132\026.tensor" +
+      "flow.ClusterDef\022\035\n\025isolate_session_state" +
+      "\030\017 \001(\010\022(\n share_cluster_devices_in_sessi" +
+      "on\030\021 \001(\010\022:\n\014experimental\030\020 \001(\0132$.tensorf" +
+      "low.ConfigProto.Experimental\0322\n\020DeviceCo" +
+      "untEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001" +
+      "\032\322\007\n\014Experimental\022\037\n\027collective_group_le" +
+      "ader\030\001 \001(\t\022\025\n\rexecutor_type\030\003 \001(\t\022\032\n\022rec" +
+      "v_buf_max_chunk\030\004 \001(\005\022\031\n\021use_numa_affini" +
+      "ty\030\005 \001(\010\0225\n-collective_deterministic_seq" +
+      "uential_execution\030\006 \001(\010\022\027\n\017collective_nc" +
+      "cl\030\007 \001(\010\0226\n.share_session_state_in_clust" +
+      "erspec_propagation\030\010 \001(\010\022\037\n\027disable_thre" +
+      "ad_spinning\030\t \001(\010\022(\n share_cluster_devic" +
+      "es_in_session\030\n \001(\010\0225\n\020session_metadata\030" +
+      "\013 \001(\0132\033.tensorflow.SessionMetadata\022!\n\031op" +
+      "timize_for_static_graph\030\014 \001(\010\022\032\n\022enable_" +
+      "mlir_bridge\030\r \001(\010\022S\n\023mlir_bridge_rollout" +
+      "\030\021 \001(\01626.tensorflow.ConfigProto.Experime" +
+      "ntal.MlirBridgeRollout\022&\n\036enable_mlir_gr" +
+      "aph_optimization\030\020 \001(\010\022\'\n\037disable_output" +
+      "_partition_graphs\030\016 \001(\010\022#\n\033xla_fusion_au" +
+      "totuner_thresh\030\017 \001(\003\022\020\n\010use_tfrt\030\022 \001(\010\022\034" +
+      "\n\024coordination_service\030\023 \001(\t\022,\n$fetch_re" +
+      "mote_devices_in_multi_client\030\024 \001(\010\"\332\001\n\021M" +
+      "lirBridgeRollout\022#\n\037MLIR_BRIDGE_ROLLOUT_" +
+      "UNSPECIFIED\020\000\022\037\n\033MLIR_BRIDGE_ROLLOUT_ENA" +
+      "BLED\020\001\022 \n\034MLIR_BRIDGE_ROLLOUT_DISABLED\020\002" +
+      "\022)\n%MLIR_BRIDGE_ROLLOUT_SAFE_MODE_ENABLE" +
+      "D\020\003\0222\n.MLIR_BRIDGE_ROLLOUT_SAFE_MODE_FAL" +
+      "LBACK_ENABLED\020\004J\004\010\002\020\003\"\341\004\n\nRunOptions\0226\n\013" +
+      "trace_level\030\001 \001(\0162!.tensorflow.RunOption" +
+      "s.TraceLevel\022\025\n\rtimeout_in_ms\030\002 \001(\003\022\034\n\024i" +
+      "nter_op_thread_pool\030\003 \001(\005\022\037\n\027output_part" +
+      "ition_graphs\030\005 \001(\010\022/\n\rdebug_options\030\006 \001(" +
+      "\0132\030.tensorflow.DebugOptions\022*\n\"report_te" +
+      "nsor_allocations_upon_oom\030\007 \001(\010\0229\n\014exper" +
+      "imental\030\010 \001(\0132#.tensorflow.RunOptions.Ex" +
+      "perimental\032\322\001\n\014Experimental\022\034\n\024collectiv" +
+      "e_graph_key\030\001 \001(\003\022\034\n\024use_run_handler_poo" +
+      "l\030\002 \001(\010\022[\n\030run_handler_pool_options\030\003 \001(" +
+      "\01329.tensorflow.RunOptions.Experimental.R" +
+      "unHandlerPoolOptions\032)\n\025RunHandlerPoolOp" +
+      "tions\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\016HARDW" +
+      "ARE_TRACE\020\002\022\016\n\nFULL_TRACE\020\003J\004\010\004\020\005\"\207\003\n\013Ru" +
+      "nMetadata\022)\n\nstep_stats\030\001 \001(\0132\025.tensorfl" +
+      "ow.StepStats\022,\n\ncost_graph\030\002 \001(\0132\030.tenso" +
+      "rflow.CostGraphDef\022.\n\020partition_graphs\030\003" +
+      " \003(\0132\024.tensorflow.GraphDef\022?\n\017function_g" +
+      "raphs\030\004 \003(\0132&.tensorflow.RunMetadata.Fun" +
+      "ctionGraphs\032\255\001\n\016FunctionGraphs\022.\n\020partit" +
+      "ion_graphs\030\001 \003(\0132\024.tensorflow.GraphDef\0224" +
+      "\n\026pre_optimization_graph\030\002 \001(\0132\024.tensorf" +
+      "low.GraphDef\0225\n\027post_optimization_graph\030" +
+      "\003 \001(\0132\024.tensorflow.GraphDef\":\n\020TensorCon" +
+      "nection\022\023\n\013from_tensor\030\001 \001(\t\022\021\n\tto_tenso" +
+      "r\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.RunOptions\0227\n" +
+      "\021tensor_connection\030\005 \003(\0132\034.tensorflow.Te" +
+      "nsorConnection\022B\n\014feed_devices\030\006 \003(\0132,.t" +
+      "ensorflow.CallableOptions.FeedDevicesEnt" +
+      "ry\022D\n\rfetch_devices\030\007 \003(\0132-.tensorflow.C" +
+      "allableOptions.FetchDevicesEntry\022\027\n\017fetc" +
+      "h_skip_sync\030\010 \001(\010\0322\n\020FeedDevicesEntry\022\013\n" +
+      "\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0323\n\021FetchDe" +
+      "vicesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" +
+      "8\001B\212\001\n\036org.tensorflow.proto.frameworkB\014C" +
+      "onfigProtosP\001ZUgithub.com/tensorflow/ten" +
+      "sorflow/tensorflow/go/core/protobuf/for_" +
+      "core_protos_go_proto\370\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -281,7 +285,7 @@ public static void registerAllExtensions(
     internal_static_tensorflow_GPUOptions_Experimental_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_GPUOptions_Experimental_descriptor,
-        new java.lang.String[] { "VirtualDevices", "UseUnifiedMemory", "NumDevToDevCopyStreams", "CollectiveRingOrder", "TimestampedAllocator", "KernelTrackerMaxInterval", "KernelTrackerMaxBytes", "KernelTrackerMaxPending", });
+        new java.lang.String[] { "VirtualDevices", "UseUnifiedMemory", "NumDevToDevCopyStreams", "CollectiveRingOrder", "TimestampedAllocator", "KernelTrackerMaxInterval", "KernelTrackerMaxBytes", "KernelTrackerMaxPending", "InternalFragmentationFraction", "UseCudaMallocAsync", });
     internal_static_tensorflow_GPUOptions_Experimental_VirtualDevices_descriptor =
       internal_static_tensorflow_GPUOptions_Experimental_descriptor.getNestedTypes().get(0);
     internal_static_tensorflow_GPUOptions_Experimental_VirtualDevices_fieldAccessorTable = new
@@ -311,7 +315,7 @@ public static void registerAllExtensions(
     internal_static_tensorflow_RPCOptions_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_RPCOptions_descriptor,
-        new java.lang.String[] { "UseRpcForInprocessMaster", "CompressionAlgorithm", "CompressionLevel", "CacheRpcResponse", "DisableSessionConnectionSharing", });
+        new java.lang.String[] { "UseRpcForInprocessMaster", "CompressionAlgorithm", "CompressionLevel", "CacheRpcResponse", "DisableSessionConnectionSharing", "NumChannelsPerTarget", });
     internal_static_tensorflow_SessionMetadata_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_tensorflow_SessionMetadata_fieldAccessorTable = new
@@ -335,7 +339,7 @@ public static void registerAllExtensions(
     internal_static_tensorflow_ConfigProto_Experimental_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.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", });
+        new java.lang.String[] { "CollectiveGroupLeader", "ExecutorType", "RecvBufMaxChunk", "UseNumaAffinity", "CollectiveDeterministicSequentialExecution", "CollectiveNccl", "ShareSessionStateInClusterspecPropagation", "DisableThreadSpinning", "ShareClusterDevicesInSession", "SessionMetadata", "OptimizeForStaticGraph", "EnableMlirBridge", "MlirBridgeRollout", "EnableMlirGraphOptimization", "DisableOutputPartitionGraphs", "XlaFusionAutotunerThresh", "UseTfrt", "CoordinationService", "FetchRemoteDevicesInMultiClient", });
     internal_static_tensorflow_RunOptions_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_tensorflow_RunOptions_fieldAccessorTable = new
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeDef.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeDef.java
new file mode 100644
index 00000000000..f075850d17f
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeDef.java
@@ -0,0 +1,1126 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tensorflow/core/framework/full_type.proto
+
+package org.tensorflow.proto.framework;
+
+/**
+ * <pre>
+ * Highly experimental and very likely to change.
+ * This encoding uses tags instead of dedicated messages for regularity. In
+ * particular the encoding imposes no restrictions on what the parameters of any
+ * type should be, which in particular needs to be true for type symbols.
+ * </pre>
+ *
+ * Protobuf type {@code tensorflow.FullTypeDef}
+ */
+public  final class FullTypeDef extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:tensorflow.FullTypeDef)
+    FullTypeDefOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use FullTypeDef.newBuilder() to construct.
+  private FullTypeDef(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private FullTypeDef() {
+    typeId_ = 0;
+    args_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new FullTypeDef();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private FullTypeDef(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8: {
+            int rawValue = input.readEnum();
+
+            typeId_ = rawValue;
+            break;
+          }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              args_ = new java.util.ArrayList<org.tensorflow.proto.framework.FullTypeDef>();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            args_.add(
+                input.readMessage(org.tensorflow.proto.framework.FullTypeDef.parser(), extensionRegistry));
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+            attrCase_ = 3;
+            attr_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        args_ = java.util.Collections.unmodifiableList(args_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return org.tensorflow.proto.framework.FullTypeProtos.internal_static_tensorflow_FullTypeDef_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return org.tensorflow.proto.framework.FullTypeProtos.internal_static_tensorflow_FullTypeDef_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.tensorflow.proto.framework.FullTypeDef.class, org.tensorflow.proto.framework.FullTypeDef.Builder.class);
+  }
+
+  private int attrCase_ = 0;
+  private java.lang.Object attr_;
+  public enum AttrCase
+      implements com.google.protobuf.Internal.EnumLite {
+    S(3),
+    ATTR_NOT_SET(0);
+    private final int value;
+    private AttrCase(int value) {
+      this.value = value;
+    }
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static AttrCase valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static AttrCase forNumber(int value) {
+      switch (value) {
+        case 3: return S;
+        case 0: return ATTR_NOT_SET;
+        default: return null;
+      }
+    }
+    public int getNumber() {
+      return this.value;
+    }
+  };
+
+  public AttrCase
+  getAttrCase() {
+    return AttrCase.forNumber(
+        attrCase_);
+  }
+
+  public static final int TYPE_ID_FIELD_NUMBER = 1;
+  private int typeId_;
+  /**
+   * <pre>
+   * The principal type represented by this object. This may be a concrete type
+   * (Tensor, Dataset) a type variable (used for dependent types) a type
+   * symbol (Any, Union). See FullTypeId for details.
+   * </pre>
+   *
+   * <code>.tensorflow.FullTypeId type_id = 1;</code>
+   */
+  public int getTypeIdValue() {
+    return typeId_;
+  }
+  /**
+   * <pre>
+   * The principal type represented by this object. This may be a concrete type
+   * (Tensor, Dataset) a type variable (used for dependent types) a type
+   * symbol (Any, Union). See FullTypeId for details.
+   * </pre>
+   *
+   * <code>.tensorflow.FullTypeId type_id = 1;</code>
+   */
+  public org.tensorflow.proto.framework.FullTypeId getTypeId() {
+    @SuppressWarnings("deprecation")
+    org.tensorflow.proto.framework.FullTypeId result = org.tensorflow.proto.framework.FullTypeId.valueOf(typeId_);
+    return result == null ? org.tensorflow.proto.framework.FullTypeId.UNRECOGNIZED : result;
+  }
+
+  public static final int ARGS_FIELD_NUMBER = 2;
+  private java.util.List<org.tensorflow.proto.framework.FullTypeDef> args_;
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  public java.util.List<org.tensorflow.proto.framework.FullTypeDef> getArgsList() {
+    return args_;
+  }
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  public java.util.List<? extends org.tensorflow.proto.framework.FullTypeDefOrBuilder> 
+      getArgsOrBuilderList() {
+    return args_;
+  }
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  public int getArgsCount() {
+    return args_.size();
+  }
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  public org.tensorflow.proto.framework.FullTypeDef getArgs(int index) {
+    return args_.get(index);
+  }
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  public org.tensorflow.proto.framework.FullTypeDefOrBuilder getArgsOrBuilder(
+      int index) {
+    return args_.get(index);
+  }
+
+  public static final int S_FIELD_NUMBER = 3;
+  /**
+   * <code>string s = 3;</code>
+   */
+  public java.lang.String getS() {
+    java.lang.Object ref = "";
+    if (attrCase_ == 3) {
+      ref = attr_;
+    }
+    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();
+      if (attrCase_ == 3) {
+        attr_ = s;
+      }
+      return s;
+    }
+  }
+  /**
+   * <code>string s = 3;</code>
+   */
+  public com.google.protobuf.ByteString
+      getSBytes() {
+    java.lang.Object ref = "";
+    if (attrCase_ == 3) {
+      ref = attr_;
+    }
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      if (attrCase_ == 3) {
+        attr_ = b;
+      }
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (typeId_ != org.tensorflow.proto.framework.FullTypeId.TFT_UNSET.getNumber()) {
+      output.writeEnum(1, typeId_);
+    }
+    for (int i = 0; i < args_.size(); i++) {
+      output.writeMessage(2, args_.get(i));
+    }
+    if (attrCase_ == 3) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, attr_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (typeId_ != org.tensorflow.proto.framework.FullTypeId.TFT_UNSET.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, typeId_);
+    }
+    for (int i = 0; i < args_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, args_.get(i));
+    }
+    if (attrCase_ == 3) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, attr_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof org.tensorflow.proto.framework.FullTypeDef)) {
+      return super.equals(obj);
+    }
+    org.tensorflow.proto.framework.FullTypeDef other = (org.tensorflow.proto.framework.FullTypeDef) obj;
+
+    if (typeId_ != other.typeId_) return false;
+    if (!getArgsList()
+        .equals(other.getArgsList())) return false;
+    if (!getAttrCase().equals(other.getAttrCase())) return false;
+    switch (attrCase_) {
+      case 3:
+        if (!getS()
+            .equals(other.getS())) return false;
+        break;
+      case 0:
+      default:
+    }
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + TYPE_ID_FIELD_NUMBER;
+    hash = (53 * hash) + typeId_;
+    if (getArgsCount() > 0) {
+      hash = (37 * hash) + ARGS_FIELD_NUMBER;
+      hash = (53 * hash) + getArgsList().hashCode();
+    }
+    switch (attrCase_) {
+      case 3:
+        hash = (37 * hash) + S_FIELD_NUMBER;
+        hash = (53 * hash) + getS().hashCode();
+        break;
+      case 0:
+      default:
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.FullTypeDef parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.tensorflow.proto.framework.FullTypeDef prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * Highly experimental and very likely to change.
+   * This encoding uses tags instead of dedicated messages for regularity. In
+   * particular the encoding imposes no restrictions on what the parameters of any
+   * type should be, which in particular needs to be true for type symbols.
+   * </pre>
+   *
+   * Protobuf type {@code tensorflow.FullTypeDef}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:tensorflow.FullTypeDef)
+      org.tensorflow.proto.framework.FullTypeDefOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.tensorflow.proto.framework.FullTypeProtos.internal_static_tensorflow_FullTypeDef_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.tensorflow.proto.framework.FullTypeProtos.internal_static_tensorflow_FullTypeDef_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.tensorflow.proto.framework.FullTypeDef.class, org.tensorflow.proto.framework.FullTypeDef.Builder.class);
+    }
+
+    // Construct using org.tensorflow.proto.framework.FullTypeDef.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getArgsFieldBuilder();
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      typeId_ = 0;
+
+      if (argsBuilder_ == null) {
+        args_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        argsBuilder_.clear();
+      }
+      attrCase_ = 0;
+      attr_ = null;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return org.tensorflow.proto.framework.FullTypeProtos.internal_static_tensorflow_FullTypeDef_descriptor;
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.FullTypeDef getDefaultInstanceForType() {
+      return org.tensorflow.proto.framework.FullTypeDef.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.FullTypeDef build() {
+      org.tensorflow.proto.framework.FullTypeDef result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.FullTypeDef buildPartial() {
+      org.tensorflow.proto.framework.FullTypeDef result = new org.tensorflow.proto.framework.FullTypeDef(this);
+      int from_bitField0_ = bitField0_;
+      result.typeId_ = typeId_;
+      if (argsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          args_ = java.util.Collections.unmodifiableList(args_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.args_ = args_;
+      } else {
+        result.args_ = argsBuilder_.build();
+      }
+      if (attrCase_ == 3) {
+        result.attr_ = attr_;
+      }
+      result.attrCase_ = attrCase_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof org.tensorflow.proto.framework.FullTypeDef) {
+        return mergeFrom((org.tensorflow.proto.framework.FullTypeDef)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(org.tensorflow.proto.framework.FullTypeDef other) {
+      if (other == org.tensorflow.proto.framework.FullTypeDef.getDefaultInstance()) return this;
+      if (other.typeId_ != 0) {
+        setTypeIdValue(other.getTypeIdValue());
+      }
+      if (argsBuilder_ == null) {
+        if (!other.args_.isEmpty()) {
+          if (args_.isEmpty()) {
+            args_ = other.args_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureArgsIsMutable();
+            args_.addAll(other.args_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.args_.isEmpty()) {
+          if (argsBuilder_.isEmpty()) {
+            argsBuilder_.dispose();
+            argsBuilder_ = null;
+            args_ = other.args_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            argsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getArgsFieldBuilder() : null;
+          } else {
+            argsBuilder_.addAllMessages(other.args_);
+          }
+        }
+      }
+      switch (other.getAttrCase()) {
+        case S: {
+          attrCase_ = 3;
+          attr_ = other.attr_;
+          onChanged();
+          break;
+        }
+        case ATTR_NOT_SET: {
+          break;
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      org.tensorflow.proto.framework.FullTypeDef parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (org.tensorflow.proto.framework.FullTypeDef) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int attrCase_ = 0;
+    private java.lang.Object attr_;
+    public AttrCase
+        getAttrCase() {
+      return AttrCase.forNumber(
+          attrCase_);
+    }
+
+    public Builder clearAttr() {
+      attrCase_ = 0;
+      attr_ = null;
+      onChanged();
+      return this;
+    }
+
+    private int bitField0_;
+
+    private int typeId_ = 0;
+    /**
+     * <pre>
+     * The principal type represented by this object. This may be a concrete type
+     * (Tensor, Dataset) a type variable (used for dependent types) a type
+     * symbol (Any, Union). See FullTypeId for details.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeId type_id = 1;</code>
+     */
+    public int getTypeIdValue() {
+      return typeId_;
+    }
+    /**
+     * <pre>
+     * The principal type represented by this object. This may be a concrete type
+     * (Tensor, Dataset) a type variable (used for dependent types) a type
+     * symbol (Any, Union). See FullTypeId for details.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeId type_id = 1;</code>
+     */
+    public Builder setTypeIdValue(int value) {
+      typeId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The principal type represented by this object. This may be a concrete type
+     * (Tensor, Dataset) a type variable (used for dependent types) a type
+     * symbol (Any, Union). See FullTypeId for details.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeId type_id = 1;</code>
+     */
+    public org.tensorflow.proto.framework.FullTypeId getTypeId() {
+      @SuppressWarnings("deprecation")
+      org.tensorflow.proto.framework.FullTypeId result = org.tensorflow.proto.framework.FullTypeId.valueOf(typeId_);
+      return result == null ? org.tensorflow.proto.framework.FullTypeId.UNRECOGNIZED : result;
+    }
+    /**
+     * <pre>
+     * The principal type represented by this object. This may be a concrete type
+     * (Tensor, Dataset) a type variable (used for dependent types) a type
+     * symbol (Any, Union). See FullTypeId for details.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeId type_id = 1;</code>
+     */
+    public Builder setTypeId(org.tensorflow.proto.framework.FullTypeId value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      typeId_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The principal type represented by this object. This may be a concrete type
+     * (Tensor, Dataset) a type variable (used for dependent types) a type
+     * symbol (Any, Union). See FullTypeId for details.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeId type_id = 1;</code>
+     */
+    public Builder clearTypeId() {
+      
+      typeId_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.util.List<org.tensorflow.proto.framework.FullTypeDef> args_ =
+      java.util.Collections.emptyList();
+    private void ensureArgsIsMutable() {
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        args_ = new java.util.ArrayList<org.tensorflow.proto.framework.FullTypeDef>(args_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        org.tensorflow.proto.framework.FullTypeDef, org.tensorflow.proto.framework.FullTypeDef.Builder, org.tensorflow.proto.framework.FullTypeDefOrBuilder> argsBuilder_;
+
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public java.util.List<org.tensorflow.proto.framework.FullTypeDef> getArgsList() {
+      if (argsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(args_);
+      } else {
+        return argsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public int getArgsCount() {
+      if (argsBuilder_ == null) {
+        return args_.size();
+      } else {
+        return argsBuilder_.getCount();
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public org.tensorflow.proto.framework.FullTypeDef getArgs(int index) {
+      if (argsBuilder_ == null) {
+        return args_.get(index);
+      } else {
+        return argsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder setArgs(
+        int index, org.tensorflow.proto.framework.FullTypeDef value) {
+      if (argsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureArgsIsMutable();
+        args_.set(index, value);
+        onChanged();
+      } else {
+        argsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder setArgs(
+        int index, org.tensorflow.proto.framework.FullTypeDef.Builder builderForValue) {
+      if (argsBuilder_ == null) {
+        ensureArgsIsMutable();
+        args_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        argsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder addArgs(org.tensorflow.proto.framework.FullTypeDef value) {
+      if (argsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureArgsIsMutable();
+        args_.add(value);
+        onChanged();
+      } else {
+        argsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder addArgs(
+        int index, org.tensorflow.proto.framework.FullTypeDef value) {
+      if (argsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureArgsIsMutable();
+        args_.add(index, value);
+        onChanged();
+      } else {
+        argsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder addArgs(
+        org.tensorflow.proto.framework.FullTypeDef.Builder builderForValue) {
+      if (argsBuilder_ == null) {
+        ensureArgsIsMutable();
+        args_.add(builderForValue.build());
+        onChanged();
+      } else {
+        argsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder addArgs(
+        int index, org.tensorflow.proto.framework.FullTypeDef.Builder builderForValue) {
+      if (argsBuilder_ == null) {
+        ensureArgsIsMutable();
+        args_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        argsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder addAllArgs(
+        java.lang.Iterable<? extends org.tensorflow.proto.framework.FullTypeDef> values) {
+      if (argsBuilder_ == null) {
+        ensureArgsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, args_);
+        onChanged();
+      } else {
+        argsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder clearArgs() {
+      if (argsBuilder_ == null) {
+        args_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        argsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public Builder removeArgs(int index) {
+      if (argsBuilder_ == null) {
+        ensureArgsIsMutable();
+        args_.remove(index);
+        onChanged();
+      } else {
+        argsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public org.tensorflow.proto.framework.FullTypeDef.Builder getArgsBuilder(
+        int index) {
+      return getArgsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public org.tensorflow.proto.framework.FullTypeDefOrBuilder getArgsOrBuilder(
+        int index) {
+      if (argsBuilder_ == null) {
+        return args_.get(index);  } else {
+        return argsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public java.util.List<? extends org.tensorflow.proto.framework.FullTypeDefOrBuilder> 
+         getArgsOrBuilderList() {
+      if (argsBuilder_ != null) {
+        return argsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(args_);
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public org.tensorflow.proto.framework.FullTypeDef.Builder addArgsBuilder() {
+      return getArgsFieldBuilder().addBuilder(
+          org.tensorflow.proto.framework.FullTypeDef.getDefaultInstance());
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public org.tensorflow.proto.framework.FullTypeDef.Builder addArgsBuilder(
+        int index) {
+      return getArgsFieldBuilder().addBuilder(
+          index, org.tensorflow.proto.framework.FullTypeDef.getDefaultInstance());
+    }
+    /**
+     * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+     */
+    public java.util.List<org.tensorflow.proto.framework.FullTypeDef.Builder> 
+         getArgsBuilderList() {
+      return getArgsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        org.tensorflow.proto.framework.FullTypeDef, org.tensorflow.proto.framework.FullTypeDef.Builder, org.tensorflow.proto.framework.FullTypeDefOrBuilder> 
+        getArgsFieldBuilder() {
+      if (argsBuilder_ == null) {
+        argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            org.tensorflow.proto.framework.FullTypeDef, org.tensorflow.proto.framework.FullTypeDef.Builder, org.tensorflow.proto.framework.FullTypeDefOrBuilder>(
+                args_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
+        args_ = null;
+      }
+      return argsBuilder_;
+    }
+
+    /**
+     * <code>string s = 3;</code>
+     */
+    public java.lang.String getS() {
+      java.lang.Object ref = "";
+      if (attrCase_ == 3) {
+        ref = attr_;
+      }
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (attrCase_ == 3) {
+          attr_ = s;
+        }
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string s = 3;</code>
+     */
+    public com.google.protobuf.ByteString
+        getSBytes() {
+      java.lang.Object ref = "";
+      if (attrCase_ == 3) {
+        ref = attr_;
+      }
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        if (attrCase_ == 3) {
+          attr_ = b;
+        }
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string s = 3;</code>
+     */
+    public Builder setS(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  attrCase_ = 3;
+      attr_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string s = 3;</code>
+     */
+    public Builder clearS() {
+      if (attrCase_ == 3) {
+        attrCase_ = 0;
+        attr_ = null;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     * <code>string s = 3;</code>
+     */
+    public Builder setSBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      attrCase_ = 3;
+      attr_ = value;
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:tensorflow.FullTypeDef)
+  }
+
+  // @@protoc_insertion_point(class_scope:tensorflow.FullTypeDef)
+  private static final org.tensorflow.proto.framework.FullTypeDef DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.tensorflow.proto.framework.FullTypeDef();
+  }
+
+  public static org.tensorflow.proto.framework.FullTypeDef getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<FullTypeDef>
+      PARSER = new com.google.protobuf.AbstractParser<FullTypeDef>() {
+    @java.lang.Override
+    public FullTypeDef parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new FullTypeDef(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<FullTypeDef> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<FullTypeDef> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.tensorflow.proto.framework.FullTypeDef getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeDefOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeDefOrBuilder.java
new file mode 100644
index 00000000000..3d0e8acddc2
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeDefOrBuilder.java
@@ -0,0 +1,66 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tensorflow/core/framework/full_type.proto
+
+package org.tensorflow.proto.framework;
+
+public interface FullTypeDefOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:tensorflow.FullTypeDef)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * The principal type represented by this object. This may be a concrete type
+   * (Tensor, Dataset) a type variable (used for dependent types) a type
+   * symbol (Any, Union). See FullTypeId for details.
+   * </pre>
+   *
+   * <code>.tensorflow.FullTypeId type_id = 1;</code>
+   */
+  int getTypeIdValue();
+  /**
+   * <pre>
+   * The principal type represented by this object. This may be a concrete type
+   * (Tensor, Dataset) a type variable (used for dependent types) a type
+   * symbol (Any, Union). See FullTypeId for details.
+   * </pre>
+   *
+   * <code>.tensorflow.FullTypeId type_id = 1;</code>
+   */
+  org.tensorflow.proto.framework.FullTypeId getTypeId();
+
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  java.util.List<org.tensorflow.proto.framework.FullTypeDef> 
+      getArgsList();
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  org.tensorflow.proto.framework.FullTypeDef getArgs(int index);
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  int getArgsCount();
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  java.util.List<? extends org.tensorflow.proto.framework.FullTypeDefOrBuilder> 
+      getArgsOrBuilderList();
+  /**
+   * <code>repeated .tensorflow.FullTypeDef args = 2;</code>
+   */
+  org.tensorflow.proto.framework.FullTypeDefOrBuilder getArgsOrBuilder(
+      int index);
+
+  /**
+   * <code>string s = 3;</code>
+   */
+  java.lang.String getS();
+  /**
+   * <code>string s = 3;</code>
+   */
+  com.google.protobuf.ByteString
+      getSBytes();
+
+  public org.tensorflow.proto.framework.FullTypeDef.AttrCase getAttrCase();
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeId.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeId.java
new file mode 100644
index 00000000000..5dec66a39a0
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeId.java
@@ -0,0 +1,598 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tensorflow/core/framework/full_type.proto
+
+package org.tensorflow.proto.framework;
+
+/**
+ * <pre>
+ * Experimental. Represents the complete type information of a TensorFlow value.
+ * </pre>
+ *
+ * Protobuf enum {@code tensorflow.FullTypeId}
+ */
+public enum FullTypeId
+    implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   * <pre>
+   * The default represents an uninitialized values.
+   * </pre>
+   *
+   * <code>TFT_UNSET = 0;</code>
+   */
+  TFT_UNSET(0),
+  /**
+   * <pre>
+   * Type variables may serve as placeholder for any other type ID in type
+   * templates.
+   * Examples:
+   *   TFT_DATASET[TFT_VAR["T"]] is a Dataset returning a type indicated by "T".
+   *   TFT_TENSOR[TFT_VAR["T"]] is a Tensor of n element type indicated by "T".
+   *   TFT_TENSOR[TFT_VAR["T"]], TFT_TENSOR[TFT_VAR["T"]] are two tensors of
+   *     identical element types.
+   *   TFT_TENSOR[TFT_VAR["P"]], TFT_TENSOR[TFT_VAR["Q"]] are two tensors of
+   *     potentially different element types.
+   * </pre>
+   *
+   * <code>TFT_VAR = 1;</code>
+   */
+  TFT_VAR(1),
+  /**
+   * <pre>
+   * Wildcard type. Describes a parameter of unknown type. In TensorFlow, that
+   * can mean either a "Top" type (accepts any type), or a dynamically typed
+   * object whose type is unknown in context.
+   * Important: "unknown" does not necessarily mean undeterminable!
+   * </pre>
+   *
+   * <code>TFT_ANY = 2;</code>
+   */
+  TFT_ANY(2),
+  /**
+   * <pre>
+   * The algebraic product type. This is an algebraic type that may be used just
+   * for logical grouping. Not to confused with TFT_TUPLE which describes a
+   * concrete object of several elements.
+   * Example:
+   *   TFT_DATASET[TFT_PRODUCT[TFT_TENSOR[TFT_INT32], TFT_TENSOR[TFT_FLOAT64]]]
+   *     is a Dataset producing two tensors, an integer one and a float one.
+   * </pre>
+   *
+   * <code>TFT_PRODUCT = 3;</code>
+   */
+  TFT_PRODUCT(3),
+  /**
+   * <pre>
+   * Callable types describe functions and ops.
+   * Parametrization:
+   *   TFT_CALLABLE[&lt;arg type&gt;, &lt;return type&gt;]
+   *   * &lt;arg_type&gt; is the type of the arguments; TFT_PRODUCT represents
+   *   multiple
+   *     arguments.
+   *   * &lt;return_type&gt; is the return type; TFT_PRODUCT represents multiple
+   *     return values (that means that callables returning multiple things
+   *     don't necessarily return a single tuple).
+   * Example:
+   *   TFT_CALLABLE[
+   *     TFT_ANY,
+   *     TFT_PRODUCT[TFT_TENSOR[TFT_INT32], TFT_TENSOR[TFT_FLOAT64]],
+   *   ]
+   *     is a callable with unspecified (for now) input arguments, and
+   *     two return values of type tensor.
+   * </pre>
+   *
+   * <code>TFT_CALLABLE = 100;</code>
+   */
+  TFT_CALLABLE(100),
+  /**
+   * <pre>
+   * The usual Tensor. This is a parametric type.
+   * Parametrization:
+   *   TFT_TENSOR[&lt;element type&gt;, &lt;shape type&gt;]
+   *   * &lt;element_type&gt; is currently limited to one of the element types
+   *     defined below.
+   *   * &lt;shape_type&gt; is not yet defined, and may only be TFT_UNKNOWN for now.
+   * A TFT_SHAPE type will be defined in the future.
+   * Example:
+   *   TFT_TENSOR[TFT_INT32, TFT_UNKNOWN]
+   *     is a Tensor of int32 element type and unknown shape.
+   * TODO(mdan): Define TFT_SHAPE and add more examples.
+   * </pre>
+   *
+   * <code>TFT_TENSOR = 1000;</code>
+   */
+  TFT_TENSOR(1000),
+  /**
+   * <pre>
+   * Array (or tensorflow::TensorList in the variant type registry).
+   * Note: this is not to be confused with the deprecated `TensorArray*` ops
+   * which are not supported by FullType.
+   * This type represents a random-access list whose elements can be
+   * described by a single type. Although immutable, Array is expected to
+   * support efficient mutation semantics (i.e. element update) in the
+   * user-facing API.
+   * The element type may be generic or even TFT_ANY for a heterogenous list.
+   * Parametrization:
+   *   TFT_ARRAY[&lt;element type&gt;]
+   *   * &lt;element_type&gt; may be any concrete type.
+   * Examples:
+   *   TFT_ARRAY[TFT_TENSOR[TFT_INT32]] is a TensorArray holding int32 Tensors
+   *     of any shape.
+   *   TFT_ARRAY[TFT_TENSOR[TFT_UNKNOWN]] is a TensorArray holding Tensors of
+   *     mixed element types.
+   *   TFT_ARRAY[TFT_UNKNOWN] is a TensorArray holding any element type.
+   *   TFT_ARRAY[] is equivalent to TFT_ARRAY[TFT_UNKNOWN].
+   *   TFT_ARRAY[TFT_ARRAY[]] is an array or arrays (of unknown types).
+   * </pre>
+   *
+   * <code>TFT_ARRAY = 1001;</code>
+   */
+  TFT_ARRAY(1001),
+  /**
+   * <pre>
+   * Optional (or tensorflow::OptionalVariant in the variant type registry).
+   * This type represents a value that may either hold an element of a single
+   * specified type, or nothing at all.
+   * Parametrization:
+   *   TFT_OPTIONAL[&lt;element type&gt;]
+   *   * &lt;element_type&gt; may be any concrete type.
+   * Examples:
+   *   TFT_OPTIONAL[TFT_TENSOR[TFT_INT32]] is an Optional holding an int32
+   *     Tensor of any shape.
+   * </pre>
+   *
+   * <code>TFT_OPTIONAL = 1002;</code>
+   */
+  TFT_OPTIONAL(1002),
+  /**
+   * <pre>
+   * Datasets created by tf.data ops and APIs. Datasets have generator/iterable
+   * semantics, that is, one can construct an iterator from them. Like
+   * Array, they are considered to return elements that can be described
+   * by a single type. Unlike Array, they do not support random access or
+   * mutation, and can potentially produce an infinite number of elements.
+   * A datasets can produce logical structures (e.g. multiple elements). This
+   * is expressed using TFT_PRODUCT.
+   * Parametrization: TFT_ARRAY[&lt;element type&gt;].
+   * &lt;element_type&gt; may be a concrete type or a type symbol. It represents the
+   *   data type of the elements produced by the dataset.
+   * Examples:
+   *   TFT_DATSET[TFT_TENSOR[TFT_INT32]] is a Dataset producing single int32
+   *     Tensors of unknown shape.
+   *   TFT_DATSET[TFT_PRODUCT[TFT_TENSOR[TFT_INT32], TFT_TENSOR[TFT_FLOAT32]] is
+   *   a
+   *     Dataset producing pairs of Tensors, one integer and one float.
+   * Note: The high ID number is to prepare for the eventuality that Datasets
+   * will be supported by user types in the future.
+   * </pre>
+   *
+   * <code>TFT_DATASET = 10102;</code>
+   */
+  TFT_DATASET(10102),
+  /**
+   * <pre>
+   * The bool element type.
+   * TODO(mdan): Quantized types, legacy representations (e.g. ref)
+   * </pre>
+   *
+   * <code>TFT_BOOL = 200;</code>
+   */
+  TFT_BOOL(200),
+  /**
+   * <pre>
+   * Integer element types.
+   * </pre>
+   *
+   * <code>TFT_UINT8 = 201;</code>
+   */
+  TFT_UINT8(201),
+  /**
+   * <code>TFT_UINT16 = 202;</code>
+   */
+  TFT_UINT16(202),
+  /**
+   * <code>TFT_UINT32 = 203;</code>
+   */
+  TFT_UINT32(203),
+  /**
+   * <code>TFT_UINT64 = 204;</code>
+   */
+  TFT_UINT64(204),
+  /**
+   * <code>TFT_INT8 = 205;</code>
+   */
+  TFT_INT8(205),
+  /**
+   * <code>TFT_INT16 = 206;</code>
+   */
+  TFT_INT16(206),
+  /**
+   * <code>TFT_INT32 = 207;</code>
+   */
+  TFT_INT32(207),
+  /**
+   * <code>TFT_INT64 = 208;</code>
+   */
+  TFT_INT64(208),
+  /**
+   * <pre>
+   * Floating-point element types.
+   * </pre>
+   *
+   * <code>TFT_HALF = 209;</code>
+   */
+  TFT_HALF(209),
+  /**
+   * <code>TFT_FLOAT = 210;</code>
+   */
+  TFT_FLOAT(210),
+  /**
+   * <code>TFT_DOUBLE = 211;</code>
+   */
+  TFT_DOUBLE(211),
+  /**
+   * <code>TFT_BFLOAT16 = 215;</code>
+   */
+  TFT_BFLOAT16(215),
+  /**
+   * <pre>
+   * Complex element types.
+   * TODO(mdan): Represent as TFT_COMPLEX[TFT_DOUBLE] instead?
+   * </pre>
+   *
+   * <code>TFT_COMPLEX64 = 212;</code>
+   */
+  TFT_COMPLEX64(212),
+  /**
+   * <code>TFT_COMPLEX128 = 213;</code>
+   */
+  TFT_COMPLEX128(213),
+  /**
+   * <pre>
+   * The string element type.
+   * </pre>
+   *
+   * <code>TFT_STRING = 214;</code>
+   */
+  TFT_STRING(214),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   * <pre>
+   * The default represents an uninitialized values.
+   * </pre>
+   *
+   * <code>TFT_UNSET = 0;</code>
+   */
+  public static final int TFT_UNSET_VALUE = 0;
+  /**
+   * <pre>
+   * Type variables may serve as placeholder for any other type ID in type
+   * templates.
+   * Examples:
+   *   TFT_DATASET[TFT_VAR["T"]] is a Dataset returning a type indicated by "T".
+   *   TFT_TENSOR[TFT_VAR["T"]] is a Tensor of n element type indicated by "T".
+   *   TFT_TENSOR[TFT_VAR["T"]], TFT_TENSOR[TFT_VAR["T"]] are two tensors of
+   *     identical element types.
+   *   TFT_TENSOR[TFT_VAR["P"]], TFT_TENSOR[TFT_VAR["Q"]] are two tensors of
+   *     potentially different element types.
+   * </pre>
+   *
+   * <code>TFT_VAR = 1;</code>
+   */
+  public static final int TFT_VAR_VALUE = 1;
+  /**
+   * <pre>
+   * Wildcard type. Describes a parameter of unknown type. In TensorFlow, that
+   * can mean either a "Top" type (accepts any type), or a dynamically typed
+   * object whose type is unknown in context.
+   * Important: "unknown" does not necessarily mean undeterminable!
+   * </pre>
+   *
+   * <code>TFT_ANY = 2;</code>
+   */
+  public static final int TFT_ANY_VALUE = 2;
+  /**
+   * <pre>
+   * The algebraic product type. This is an algebraic type that may be used just
+   * for logical grouping. Not to confused with TFT_TUPLE which describes a
+   * concrete object of several elements.
+   * Example:
+   *   TFT_DATASET[TFT_PRODUCT[TFT_TENSOR[TFT_INT32], TFT_TENSOR[TFT_FLOAT64]]]
+   *     is a Dataset producing two tensors, an integer one and a float one.
+   * </pre>
+   *
+   * <code>TFT_PRODUCT = 3;</code>
+   */
+  public static final int TFT_PRODUCT_VALUE = 3;
+  /**
+   * <pre>
+   * Callable types describe functions and ops.
+   * Parametrization:
+   *   TFT_CALLABLE[&lt;arg type&gt;, &lt;return type&gt;]
+   *   * &lt;arg_type&gt; is the type of the arguments; TFT_PRODUCT represents
+   *   multiple
+   *     arguments.
+   *   * &lt;return_type&gt; is the return type; TFT_PRODUCT represents multiple
+   *     return values (that means that callables returning multiple things
+   *     don't necessarily return a single tuple).
+   * Example:
+   *   TFT_CALLABLE[
+   *     TFT_ANY,
+   *     TFT_PRODUCT[TFT_TENSOR[TFT_INT32], TFT_TENSOR[TFT_FLOAT64]],
+   *   ]
+   *     is a callable with unspecified (for now) input arguments, and
+   *     two return values of type tensor.
+   * </pre>
+   *
+   * <code>TFT_CALLABLE = 100;</code>
+   */
+  public static final int TFT_CALLABLE_VALUE = 100;
+  /**
+   * <pre>
+   * The usual Tensor. This is a parametric type.
+   * Parametrization:
+   *   TFT_TENSOR[&lt;element type&gt;, &lt;shape type&gt;]
+   *   * &lt;element_type&gt; is currently limited to one of the element types
+   *     defined below.
+   *   * &lt;shape_type&gt; is not yet defined, and may only be TFT_UNKNOWN for now.
+   * A TFT_SHAPE type will be defined in the future.
+   * Example:
+   *   TFT_TENSOR[TFT_INT32, TFT_UNKNOWN]
+   *     is a Tensor of int32 element type and unknown shape.
+   * TODO(mdan): Define TFT_SHAPE and add more examples.
+   * </pre>
+   *
+   * <code>TFT_TENSOR = 1000;</code>
+   */
+  public static final int TFT_TENSOR_VALUE = 1000;
+  /**
+   * <pre>
+   * Array (or tensorflow::TensorList in the variant type registry).
+   * Note: this is not to be confused with the deprecated `TensorArray*` ops
+   * which are not supported by FullType.
+   * This type represents a random-access list whose elements can be
+   * described by a single type. Although immutable, Array is expected to
+   * support efficient mutation semantics (i.e. element update) in the
+   * user-facing API.
+   * The element type may be generic or even TFT_ANY for a heterogenous list.
+   * Parametrization:
+   *   TFT_ARRAY[&lt;element type&gt;]
+   *   * &lt;element_type&gt; may be any concrete type.
+   * Examples:
+   *   TFT_ARRAY[TFT_TENSOR[TFT_INT32]] is a TensorArray holding int32 Tensors
+   *     of any shape.
+   *   TFT_ARRAY[TFT_TENSOR[TFT_UNKNOWN]] is a TensorArray holding Tensors of
+   *     mixed element types.
+   *   TFT_ARRAY[TFT_UNKNOWN] is a TensorArray holding any element type.
+   *   TFT_ARRAY[] is equivalent to TFT_ARRAY[TFT_UNKNOWN].
+   *   TFT_ARRAY[TFT_ARRAY[]] is an array or arrays (of unknown types).
+   * </pre>
+   *
+   * <code>TFT_ARRAY = 1001;</code>
+   */
+  public static final int TFT_ARRAY_VALUE = 1001;
+  /**
+   * <pre>
+   * Optional (or tensorflow::OptionalVariant in the variant type registry).
+   * This type represents a value that may either hold an element of a single
+   * specified type, or nothing at all.
+   * Parametrization:
+   *   TFT_OPTIONAL[&lt;element type&gt;]
+   *   * &lt;element_type&gt; may be any concrete type.
+   * Examples:
+   *   TFT_OPTIONAL[TFT_TENSOR[TFT_INT32]] is an Optional holding an int32
+   *     Tensor of any shape.
+   * </pre>
+   *
+   * <code>TFT_OPTIONAL = 1002;</code>
+   */
+  public static final int TFT_OPTIONAL_VALUE = 1002;
+  /**
+   * <pre>
+   * Datasets created by tf.data ops and APIs. Datasets have generator/iterable
+   * semantics, that is, one can construct an iterator from them. Like
+   * Array, they are considered to return elements that can be described
+   * by a single type. Unlike Array, they do not support random access or
+   * mutation, and can potentially produce an infinite number of elements.
+   * A datasets can produce logical structures (e.g. multiple elements). This
+   * is expressed using TFT_PRODUCT.
+   * Parametrization: TFT_ARRAY[&lt;element type&gt;].
+   * &lt;element_type&gt; may be a concrete type or a type symbol. It represents the
+   *   data type of the elements produced by the dataset.
+   * Examples:
+   *   TFT_DATSET[TFT_TENSOR[TFT_INT32]] is a Dataset producing single int32
+   *     Tensors of unknown shape.
+   *   TFT_DATSET[TFT_PRODUCT[TFT_TENSOR[TFT_INT32], TFT_TENSOR[TFT_FLOAT32]] is
+   *   a
+   *     Dataset producing pairs of Tensors, one integer and one float.
+   * Note: The high ID number is to prepare for the eventuality that Datasets
+   * will be supported by user types in the future.
+   * </pre>
+   *
+   * <code>TFT_DATASET = 10102;</code>
+   */
+  public static final int TFT_DATASET_VALUE = 10102;
+  /**
+   * <pre>
+   * The bool element type.
+   * TODO(mdan): Quantized types, legacy representations (e.g. ref)
+   * </pre>
+   *
+   * <code>TFT_BOOL = 200;</code>
+   */
+  public static final int TFT_BOOL_VALUE = 200;
+  /**
+   * <pre>
+   * Integer element types.
+   * </pre>
+   *
+   * <code>TFT_UINT8 = 201;</code>
+   */
+  public static final int TFT_UINT8_VALUE = 201;
+  /**
+   * <code>TFT_UINT16 = 202;</code>
+   */
+  public static final int TFT_UINT16_VALUE = 202;
+  /**
+   * <code>TFT_UINT32 = 203;</code>
+   */
+  public static final int TFT_UINT32_VALUE = 203;
+  /**
+   * <code>TFT_UINT64 = 204;</code>
+   */
+  public static final int TFT_UINT64_VALUE = 204;
+  /**
+   * <code>TFT_INT8 = 205;</code>
+   */
+  public static final int TFT_INT8_VALUE = 205;
+  /**
+   * <code>TFT_INT16 = 206;</code>
+   */
+  public static final int TFT_INT16_VALUE = 206;
+  /**
+   * <code>TFT_INT32 = 207;</code>
+   */
+  public static final int TFT_INT32_VALUE = 207;
+  /**
+   * <code>TFT_INT64 = 208;</code>
+   */
+  public static final int TFT_INT64_VALUE = 208;
+  /**
+   * <pre>
+   * Floating-point element types.
+   * </pre>
+   *
+   * <code>TFT_HALF = 209;</code>
+   */
+  public static final int TFT_HALF_VALUE = 209;
+  /**
+   * <code>TFT_FLOAT = 210;</code>
+   */
+  public static final int TFT_FLOAT_VALUE = 210;
+  /**
+   * <code>TFT_DOUBLE = 211;</code>
+   */
+  public static final int TFT_DOUBLE_VALUE = 211;
+  /**
+   * <code>TFT_BFLOAT16 = 215;</code>
+   */
+  public static final int TFT_BFLOAT16_VALUE = 215;
+  /**
+   * <pre>
+   * Complex element types.
+   * TODO(mdan): Represent as TFT_COMPLEX[TFT_DOUBLE] instead?
+   * </pre>
+   *
+   * <code>TFT_COMPLEX64 = 212;</code>
+   */
+  public static final int TFT_COMPLEX64_VALUE = 212;
+  /**
+   * <code>TFT_COMPLEX128 = 213;</code>
+   */
+  public static final int TFT_COMPLEX128_VALUE = 213;
+  /**
+   * <pre>
+   * The string element type.
+   * </pre>
+   *
+   * <code>TFT_STRING = 214;</code>
+   */
+  public static final int TFT_STRING_VALUE = 214;
+
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static FullTypeId valueOf(int value) {
+    return forNumber(value);
+  }
+
+  public static FullTypeId forNumber(int value) {
+    switch (value) {
+      case 0: return TFT_UNSET;
+      case 1: return TFT_VAR;
+      case 2: return TFT_ANY;
+      case 3: return TFT_PRODUCT;
+      case 100: return TFT_CALLABLE;
+      case 1000: return TFT_TENSOR;
+      case 1001: return TFT_ARRAY;
+      case 1002: return TFT_OPTIONAL;
+      case 10102: return TFT_DATASET;
+      case 200: return TFT_BOOL;
+      case 201: return TFT_UINT8;
+      case 202: return TFT_UINT16;
+      case 203: return TFT_UINT32;
+      case 204: return TFT_UINT64;
+      case 205: return TFT_INT8;
+      case 206: return TFT_INT16;
+      case 207: return TFT_INT32;
+      case 208: return TFT_INT64;
+      case 209: return TFT_HALF;
+      case 210: return TFT_FLOAT;
+      case 211: return TFT_DOUBLE;
+      case 215: return TFT_BFLOAT16;
+      case 212: return TFT_COMPLEX64;
+      case 213: return TFT_COMPLEX128;
+      case 214: return TFT_STRING;
+      default: return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap<FullTypeId>
+      internalGetValueMap() {
+    return internalValueMap;
+  }
+  private static final com.google.protobuf.Internal.EnumLiteMap<
+      FullTypeId> internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap<FullTypeId>() {
+          public FullTypeId findValueByNumber(int number) {
+            return FullTypeId.forNumber(number);
+          }
+        };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor
+      getValueDescriptor() {
+    return getDescriptor().getValues().get(ordinal());
+  }
+  public final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptorForType() {
+    return getDescriptor();
+  }
+  public static final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptor() {
+    return org.tensorflow.proto.framework.FullTypeProtos.getDescriptor().getEnumTypes().get(0);
+  }
+
+  private static final FullTypeId[] VALUES = values();
+
+  public static FullTypeId valueOf(
+      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException(
+        "EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private FullTypeId(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:tensorflow.FullTypeId)
+}
+
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeProtos.java
new file mode 100644
index 00000000000..99f7eecbb7a
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FullTypeProtos.java
@@ -0,0 +1,64 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tensorflow/core/framework/full_type.proto
+
+package org.tensorflow.proto.framework;
+
+public final class FullTypeProtos {
+  private FullTypeProtos() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_tensorflow_FullTypeDef_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_tensorflow_FullTypeDef_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n)tensorflow/core/framework/full_type.pr" +
+      "oto\022\ntensorflow\"r\n\013FullTypeDef\022\'\n\007type_i" +
+      "d\030\001 \001(\0162\026.tensorflow.FullTypeId\022%\n\004args\030" +
+      "\002 \003(\0132\027.tensorflow.FullTypeDef\022\013\n\001s\030\003 \001(" +
+      "\tH\000B\006\n\004attr*\254\003\n\nFullTypeId\022\r\n\tTFT_UNSET\020" +
+      "\000\022\013\n\007TFT_VAR\020\001\022\013\n\007TFT_ANY\020\002\022\017\n\013TFT_PRODU" +
+      "CT\020\003\022\020\n\014TFT_CALLABLE\020d\022\017\n\nTFT_TENSOR\020\350\007\022" +
+      "\016\n\tTFT_ARRAY\020\351\007\022\021\n\014TFT_OPTIONAL\020\352\007\022\020\n\013TF" +
+      "T_DATASET\020\366N\022\r\n\010TFT_BOOL\020\310\001\022\016\n\tTFT_UINT8" +
+      "\020\311\001\022\017\n\nTFT_UINT16\020\312\001\022\017\n\nTFT_UINT32\020\313\001\022\017\n" +
+      "\nTFT_UINT64\020\314\001\022\r\n\010TFT_INT8\020\315\001\022\016\n\tTFT_INT" +
+      "16\020\316\001\022\016\n\tTFT_INT32\020\317\001\022\016\n\tTFT_INT64\020\320\001\022\r\n" +
+      "\010TFT_HALF\020\321\001\022\016\n\tTFT_FLOAT\020\322\001\022\017\n\nTFT_DOUB" +
+      "LE\020\323\001\022\021\n\014TFT_BFLOAT16\020\327\001\022\022\n\rTFT_COMPLEX6" +
+      "4\020\324\001\022\023\n\016TFT_COMPLEX128\020\325\001\022\017\n\nTFT_STRING\020" +
+      "\326\001B\203\001\n\036org.tensorflow.proto.frameworkB\016F" +
+      "ullTypeProtosP\001ZLgithub.com/tensorflow/t" +
+      "ensorflow/tensorflow/go/core/framework/t" +
+      "ypes_go_proto\370\001\001b\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_tensorflow_FullTypeDef_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_tensorflow_FullTypeDef_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_tensorflow_FullTypeDef_descriptor,
+        new java.lang.String[] { "TypeId", "Args", "S", "Attr", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionDefLibrary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionDefLibrary.java
index a4ad715f17c..7619ea1b885 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionDefLibrary.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionDefLibrary.java
@@ -22,6 +22,7 @@ private FunctionDefLibrary(com.google.protobuf.GeneratedMessageV3.Builder<?> bui
   private FunctionDefLibrary() {
     function_ = java.util.Collections.emptyList();
     gradient_ = java.util.Collections.emptyList();
+    registeredGradients_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
@@ -73,6 +74,15 @@ private FunctionDefLibrary(
                 input.readMessage(org.tensorflow.proto.framework.GradientDef.parser(), extensionRegistry));
             break;
           }
+          case 26: {
+            if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+              registeredGradients_ = new java.util.ArrayList<org.tensorflow.proto.framework.RegisteredGradient>();
+              mutable_bitField0_ |= 0x00000004;
+            }
+            registeredGradients_.add(
+                input.readMessage(org.tensorflow.proto.framework.RegisteredGradient.parser(), extensionRegistry));
+            break;
+          }
           default: {
             if (!parseUnknownField(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -94,6 +104,9 @@ private FunctionDefLibrary(
       if (((mutable_bitField0_ & 0x00000002) != 0)) {
         gradient_ = java.util.Collections.unmodifiableList(gradient_);
       }
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        registeredGradients_ = java.util.Collections.unmodifiableList(registeredGradients_);
+      }
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
@@ -181,6 +194,41 @@ public org.tensorflow.proto.framework.GradientDefOrBuilder getGradientOrBuilder(
     return gradient_.get(index);
   }
 
+  public static final int REGISTERED_GRADIENTS_FIELD_NUMBER = 3;
+  private java.util.List<org.tensorflow.proto.framework.RegisteredGradient> registeredGradients_;
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  public java.util.List<org.tensorflow.proto.framework.RegisteredGradient> getRegisteredGradientsList() {
+    return registeredGradients_;
+  }
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  public java.util.List<? extends org.tensorflow.proto.framework.RegisteredGradientOrBuilder> 
+      getRegisteredGradientsOrBuilderList() {
+    return registeredGradients_;
+  }
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  public int getRegisteredGradientsCount() {
+    return registeredGradients_.size();
+  }
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  public org.tensorflow.proto.framework.RegisteredGradient getRegisteredGradients(int index) {
+    return registeredGradients_.get(index);
+  }
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  public org.tensorflow.proto.framework.RegisteredGradientOrBuilder getRegisteredGradientsOrBuilder(
+      int index) {
+    return registeredGradients_.get(index);
+  }
+
   private byte memoizedIsInitialized = -1;
   @java.lang.Override
   public final boolean isInitialized() {
@@ -201,6 +249,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     for (int i = 0; i < gradient_.size(); i++) {
       output.writeMessage(2, gradient_.get(i));
     }
+    for (int i = 0; i < registeredGradients_.size(); i++) {
+      output.writeMessage(3, registeredGradients_.get(i));
+    }
     unknownFields.writeTo(output);
   }
 
@@ -218,6 +269,10 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, gradient_.get(i));
     }
+    for (int i = 0; i < registeredGradients_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, registeredGradients_.get(i));
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -237,6 +292,8 @@ public boolean equals(final java.lang.Object obj) {
         .equals(other.getFunctionList())) return false;
     if (!getGradientList()
         .equals(other.getGradientList())) return false;
+    if (!getRegisteredGradientsList()
+        .equals(other.getRegisteredGradientsList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -256,6 +313,10 @@ public int hashCode() {
       hash = (37 * hash) + GRADIENT_FIELD_NUMBER;
       hash = (53 * hash) + getGradientList().hashCode();
     }
+    if (getRegisteredGradientsCount() > 0) {
+      hash = (37 * hash) + REGISTERED_GRADIENTS_FIELD_NUMBER;
+      hash = (53 * hash) + getRegisteredGradientsList().hashCode();
+    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -390,6 +451,7 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
         getFunctionFieldBuilder();
         getGradientFieldBuilder();
+        getRegisteredGradientsFieldBuilder();
       }
     }
     @java.lang.Override
@@ -407,6 +469,12 @@ public Builder clear() {
       } else {
         gradientBuilder_.clear();
       }
+      if (registeredGradientsBuilder_ == null) {
+        registeredGradients_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+      } else {
+        registeredGradientsBuilder_.clear();
+      }
       return this;
     }
 
@@ -452,6 +520,15 @@ public org.tensorflow.proto.framework.FunctionDefLibrary buildPartial() {
       } else {
         result.gradient_ = gradientBuilder_.build();
       }
+      if (registeredGradientsBuilder_ == null) {
+        if (((bitField0_ & 0x00000004) != 0)) {
+          registeredGradients_ = java.util.Collections.unmodifiableList(registeredGradients_);
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.registeredGradients_ = registeredGradients_;
+      } else {
+        result.registeredGradients_ = registeredGradientsBuilder_.build();
+      }
       onBuilt();
       return result;
     }
@@ -552,6 +629,32 @@ public Builder mergeFrom(org.tensorflow.proto.framework.FunctionDefLibrary other
           }
         }
       }
+      if (registeredGradientsBuilder_ == null) {
+        if (!other.registeredGradients_.isEmpty()) {
+          if (registeredGradients_.isEmpty()) {
+            registeredGradients_ = other.registeredGradients_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureRegisteredGradientsIsMutable();
+            registeredGradients_.addAll(other.registeredGradients_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.registeredGradients_.isEmpty()) {
+          if (registeredGradientsBuilder_.isEmpty()) {
+            registeredGradientsBuilder_.dispose();
+            registeredGradientsBuilder_ = null;
+            registeredGradients_ = other.registeredGradients_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+            registeredGradientsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getRegisteredGradientsFieldBuilder() : null;
+          } else {
+            registeredGradientsBuilder_.addAllMessages(other.registeredGradients_);
+          }
+        }
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1061,6 +1164,246 @@ public org.tensorflow.proto.framework.GradientDef.Builder addGradientBuilder(
       }
       return gradientBuilder_;
     }
+
+    private java.util.List<org.tensorflow.proto.framework.RegisteredGradient> registeredGradients_ =
+      java.util.Collections.emptyList();
+    private void ensureRegisteredGradientsIsMutable() {
+      if (!((bitField0_ & 0x00000004) != 0)) {
+        registeredGradients_ = new java.util.ArrayList<org.tensorflow.proto.framework.RegisteredGradient>(registeredGradients_);
+        bitField0_ |= 0x00000004;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        org.tensorflow.proto.framework.RegisteredGradient, org.tensorflow.proto.framework.RegisteredGradient.Builder, org.tensorflow.proto.framework.RegisteredGradientOrBuilder> registeredGradientsBuilder_;
+
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public java.util.List<org.tensorflow.proto.framework.RegisteredGradient> getRegisteredGradientsList() {
+      if (registeredGradientsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(registeredGradients_);
+      } else {
+        return registeredGradientsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public int getRegisteredGradientsCount() {
+      if (registeredGradientsBuilder_ == null) {
+        return registeredGradients_.size();
+      } else {
+        return registeredGradientsBuilder_.getCount();
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public org.tensorflow.proto.framework.RegisteredGradient getRegisteredGradients(int index) {
+      if (registeredGradientsBuilder_ == null) {
+        return registeredGradients_.get(index);
+      } else {
+        return registeredGradientsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder setRegisteredGradients(
+        int index, org.tensorflow.proto.framework.RegisteredGradient value) {
+      if (registeredGradientsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRegisteredGradientsIsMutable();
+        registeredGradients_.set(index, value);
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder setRegisteredGradients(
+        int index, org.tensorflow.proto.framework.RegisteredGradient.Builder builderForValue) {
+      if (registeredGradientsBuilder_ == null) {
+        ensureRegisteredGradientsIsMutable();
+        registeredGradients_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder addRegisteredGradients(org.tensorflow.proto.framework.RegisteredGradient value) {
+      if (registeredGradientsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRegisteredGradientsIsMutable();
+        registeredGradients_.add(value);
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder addRegisteredGradients(
+        int index, org.tensorflow.proto.framework.RegisteredGradient value) {
+      if (registeredGradientsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRegisteredGradientsIsMutable();
+        registeredGradients_.add(index, value);
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder addRegisteredGradients(
+        org.tensorflow.proto.framework.RegisteredGradient.Builder builderForValue) {
+      if (registeredGradientsBuilder_ == null) {
+        ensureRegisteredGradientsIsMutable();
+        registeredGradients_.add(builderForValue.build());
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder addRegisteredGradients(
+        int index, org.tensorflow.proto.framework.RegisteredGradient.Builder builderForValue) {
+      if (registeredGradientsBuilder_ == null) {
+        ensureRegisteredGradientsIsMutable();
+        registeredGradients_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder addAllRegisteredGradients(
+        java.lang.Iterable<? extends org.tensorflow.proto.framework.RegisteredGradient> values) {
+      if (registeredGradientsBuilder_ == null) {
+        ensureRegisteredGradientsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, registeredGradients_);
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder clearRegisteredGradients() {
+      if (registeredGradientsBuilder_ == null) {
+        registeredGradients_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public Builder removeRegisteredGradients(int index) {
+      if (registeredGradientsBuilder_ == null) {
+        ensureRegisteredGradientsIsMutable();
+        registeredGradients_.remove(index);
+        onChanged();
+      } else {
+        registeredGradientsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public org.tensorflow.proto.framework.RegisteredGradient.Builder getRegisteredGradientsBuilder(
+        int index) {
+      return getRegisteredGradientsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public org.tensorflow.proto.framework.RegisteredGradientOrBuilder getRegisteredGradientsOrBuilder(
+        int index) {
+      if (registeredGradientsBuilder_ == null) {
+        return registeredGradients_.get(index);  } else {
+        return registeredGradientsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public java.util.List<? extends org.tensorflow.proto.framework.RegisteredGradientOrBuilder> 
+         getRegisteredGradientsOrBuilderList() {
+      if (registeredGradientsBuilder_ != null) {
+        return registeredGradientsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(registeredGradients_);
+      }
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public org.tensorflow.proto.framework.RegisteredGradient.Builder addRegisteredGradientsBuilder() {
+      return getRegisteredGradientsFieldBuilder().addBuilder(
+          org.tensorflow.proto.framework.RegisteredGradient.getDefaultInstance());
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public org.tensorflow.proto.framework.RegisteredGradient.Builder addRegisteredGradientsBuilder(
+        int index) {
+      return getRegisteredGradientsFieldBuilder().addBuilder(
+          index, org.tensorflow.proto.framework.RegisteredGradient.getDefaultInstance());
+    }
+    /**
+     * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+     */
+    public java.util.List<org.tensorflow.proto.framework.RegisteredGradient.Builder> 
+         getRegisteredGradientsBuilderList() {
+      return getRegisteredGradientsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        org.tensorflow.proto.framework.RegisteredGradient, org.tensorflow.proto.framework.RegisteredGradient.Builder, org.tensorflow.proto.framework.RegisteredGradientOrBuilder> 
+        getRegisteredGradientsFieldBuilder() {
+      if (registeredGradientsBuilder_ == null) {
+        registeredGradientsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            org.tensorflow.proto.framework.RegisteredGradient, org.tensorflow.proto.framework.RegisteredGradient.Builder, org.tensorflow.proto.framework.RegisteredGradientOrBuilder>(
+                registeredGradients_,
+                ((bitField0_ & 0x00000004) != 0),
+                getParentForChildren(),
+                isClean());
+        registeredGradients_ = null;
+      }
+      return registeredGradientsBuilder_;
+    }
     @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionDefLibraryOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionDefLibraryOrBuilder.java
index cfb61e977ba..5a8d9c6ae5e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionDefLibraryOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionDefLibraryOrBuilder.java
@@ -54,4 +54,28 @@ org.tensorflow.proto.framework.FunctionDefOrBuilder getFunctionOrBuilder(
    */
   org.tensorflow.proto.framework.GradientDefOrBuilder getGradientOrBuilder(
       int index);
+
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  java.util.List<org.tensorflow.proto.framework.RegisteredGradient> 
+      getRegisteredGradientsList();
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  org.tensorflow.proto.framework.RegisteredGradient getRegisteredGradients(int index);
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  int getRegisteredGradientsCount();
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  java.util.List<? extends org.tensorflow.proto.framework.RegisteredGradientOrBuilder> 
+      getRegisteredGradientsOrBuilderList();
+  /**
+   * <code>repeated .tensorflow.RegisteredGradient registered_gradients = 3;</code>
+   */
+  org.tensorflow.proto.framework.RegisteredGradientOrBuilder getRegisteredGradientsOrBuilder(
+      int index);
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionProtos.java
index e33df603ca8..a29149a8179 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/FunctionProtos.java
@@ -64,6 +64,11 @@ public static void registerAllExtensions(
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_tensorflow_GradientDef_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_tensorflow_RegisteredGradient_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_tensorflow_RegisteredGradient_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -77,36 +82,39 @@ public static void registerAllExtensions(
       "to\022\ntensorflow\032*tensorflow/core/framewor" +
       "k/attr_value.proto\032(tensorflow/core/fram" +
       "ework/node_def.proto\032&tensorflow/core/fr" +
-      "amework/op_def.proto\"j\n\022FunctionDefLibra" +
-      "ry\022)\n\010function\030\001 \003(\0132\027.tensorflow.Functi" +
-      "onDef\022)\n\010gradient\030\002 \003(\0132\027.tensorflow.Gra" +
-      "dientDef\"\304\006\n\013FunctionDef\022$\n\tsignature\030\001 " +
-      "\001(\0132\021.tensorflow.OpDef\022/\n\004attr\030\005 \003(\0132!.t" +
-      "ensorflow.FunctionDef.AttrEntry\0226\n\010arg_a" +
-      "ttr\030\007 \003(\0132$.tensorflow.FunctionDef.ArgAt" +
-      "trEntry\022P\n\026resource_arg_unique_id\030\010 \003(\0132" +
-      "0.tensorflow.FunctionDef.ResourceArgUniq" +
-      "ueIdEntry\022%\n\010node_def\030\003 \003(\0132\023.tensorflow" +
-      ".NodeDef\022-\n\003ret\030\004 \003(\0132 .tensorflow.Funct" +
-      "ionDef.RetEntry\022<\n\013control_ret\030\006 \003(\0132\'.t" +
-      "ensorflow.FunctionDef.ControlRetEntry\032B\n" +
-      "\tAttrEntry\022\013\n\003key\030\001 \001(\t\022$\n\005value\030\002 \001(\0132\025" +
-      ".tensorflow.AttrValue:\0028\001\032\210\001\n\010ArgAttrs\0228" +
-      "\n\004attr\030\001 \003(\0132*.tensorflow.FunctionDef.Ar" +
-      "gAttrs.AttrEntry\032B\n\tAttrEntry\022\013\n\003key\030\001 \001" +
-      "(\t\022$\n\005value\030\002 \001(\0132\025.tensorflow.AttrValue" +
-      ":\0028\001\032P\n\014ArgAttrEntry\022\013\n\003key\030\001 \001(\r\022/\n\005val" +
-      "ue\030\002 \001(\0132 .tensorflow.FunctionDef.ArgAtt" +
-      "rs:\0028\001\032:\n\030ResourceArgUniqueIdEntry\022\013\n\003ke" +
-      "y\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032*\n\010RetEntry\022\013" +
-      "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Contro" +
-      "lRetEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028" +
-      "\001J\004\010\002\020\003\";\n\013GradientDef\022\025\n\rfunction_name\030" +
-      "\001 \001(\t\022\025\n\rgradient_func\030\002 \001(\tB\206\001\n\036org.ten" +
-      "sorflow.proto.frameworkB\016FunctionProtosP" +
-      "\001ZOgithub.com/tensorflow/tensorflow/tens" +
-      "orflow/go/core/framework/function_go_pro" +
-      "to\370\001\001b\006proto3"
+      "amework/op_def.proto\"\250\001\n\022FunctionDefLibr" +
+      "ary\022)\n\010function\030\001 \003(\0132\027.tensorflow.Funct" +
+      "ionDef\022)\n\010gradient\030\002 \003(\0132\027.tensorflow.Gr" +
+      "adientDef\022<\n\024registered_gradients\030\003 \003(\0132" +
+      "\036.tensorflow.RegisteredGradient\"\304\006\n\013Func" +
+      "tionDef\022$\n\tsignature\030\001 \001(\0132\021.tensorflow." +
+      "OpDef\022/\n\004attr\030\005 \003(\0132!.tensorflow.Functio" +
+      "nDef.AttrEntry\0226\n\010arg_attr\030\007 \003(\0132$.tenso" +
+      "rflow.FunctionDef.ArgAttrEntry\022P\n\026resour" +
+      "ce_arg_unique_id\030\010 \003(\01320.tensorflow.Func" +
+      "tionDef.ResourceArgUniqueIdEntry\022%\n\010node" +
+      "_def\030\003 \003(\0132\023.tensorflow.NodeDef\022-\n\003ret\030\004" +
+      " \003(\0132 .tensorflow.FunctionDef.RetEntry\022<" +
+      "\n\013control_ret\030\006 \003(\0132\'.tensorflow.Functio" +
+      "nDef.ControlRetEntry\032B\n\tAttrEntry\022\013\n\003key" +
+      "\030\001 \001(\t\022$\n\005value\030\002 \001(\0132\025.tensorflow.AttrV" +
+      "alue:\0028\001\032\210\001\n\010ArgAttrs\0228\n\004attr\030\001 \003(\0132*.te" +
+      "nsorflow.FunctionDef.ArgAttrs.AttrEntry\032" +
+      "B\n\tAttrEntry\022\013\n\003key\030\001 \001(\t\022$\n\005value\030\002 \001(\013" +
+      "2\025.tensorflow.AttrValue:\0028\001\032P\n\014ArgAttrEn" +
+      "try\022\013\n\003key\030\001 \001(\r\022/\n\005value\030\002 \001(\0132 .tensor" +
+      "flow.FunctionDef.ArgAttrs:\0028\001\032:\n\030Resourc" +
+      "eArgUniqueIdEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
+      "\002 \001(\r:\0028\001\032*\n\010RetEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
+      "lue\030\002 \001(\t:\0028\001\0321\n\017ControlRetEntry\022\013\n\003key\030" +
+      "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001J\004\010\002\020\003\";\n\013Gradie" +
+      "ntDef\022\025\n\rfunction_name\030\001 \001(\t\022\025\n\rgradient" +
+      "_func\030\002 \001(\t\"G\n\022RegisteredGradient\022\025\n\rgra" +
+      "dient_func\030\001 \001(\t\022\032\n\022registered_op_type\030\002" +
+      " \001(\tB\206\001\n\036org.tensorflow.proto.frameworkB" +
+      "\016FunctionProtosP\001ZOgithub.com/tensorflow" +
+      "/tensorflow/tensorflow/go/core/framework" +
+      "/function_go_proto\370\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -120,7 +128,7 @@ public static void registerAllExtensions(
     internal_static_tensorflow_FunctionDefLibrary_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_FunctionDefLibrary_descriptor,
-        new java.lang.String[] { "Function", "Gradient", });
+        new java.lang.String[] { "Function", "Gradient", "RegisteredGradients", });
     internal_static_tensorflow_FunctionDef_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_tensorflow_FunctionDef_fieldAccessorTable = new
@@ -175,6 +183,12 @@ public static void registerAllExtensions(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_GradientDef_descriptor,
         new java.lang.String[] { "FunctionName", "GradientFunc", });
+    internal_static_tensorflow_RegisteredGradient_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_tensorflow_RegisteredGradient_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_tensorflow_RegisteredGradient_descriptor,
+        new java.lang.String[] { "GradientFunc", "RegisteredOpType", });
     org.tensorflow.proto.framework.AttrValueProtos.getDescriptor();
     org.tensorflow.proto.framework.NodeProto.getDescriptor();
     org.tensorflow.proto.framework.OpDefProtos.getDescriptor();
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/GPUOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/GPUOptions.java
index 44b8a1c43e3..dab612abaa5 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/GPUOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/GPUOptions.java
@@ -393,6 +393,32 @@ org.tensorflow.proto.framework.GPUOptions.Experimental.VirtualDevicesOrBuilder g
      * <code>int32 kernel_tracker_max_pending = 9;</code>
      */
     int getKernelTrackerMaxPending();
+
+    /**
+     * <pre>
+     * BFC Allocator can return an allocated chunk of memory upto 2x the
+     * requested size. For virtual devices with tight memory constraints, and
+     * proportionately large allocation requests, this can lead to a significant
+     * reduction in available memory. The threshold below controls when a chunk
+     * should be split if the chunk size exceeds requested memory size. It is
+     * expressed as a fraction of total available memory for the tf device. For
+     * example setting it to 0.05 would imply a chunk needs to be split if its
+     * size exceeds the requested memory by 5% of the total virtual device/gpu
+     * memory size.
+     * </pre>
+     *
+     * <code>double internal_fragmentation_fraction = 10;</code>
+     */
+    double getInternalFragmentationFraction();
+
+    /**
+     * <pre>
+     * When true, use CUDA cudaMallocAsync API instead of TF gpu allocator.
+     * </pre>
+     *
+     * <code>bool use_cuda_malloc_async = 11;</code>
+     */
+    boolean getUseCudaMallocAsync();
   }
   /**
    * Protobuf type {@code tensorflow.GPUOptions.Experimental}
@@ -487,6 +513,16 @@ private Experimental(
               kernelTrackerMaxPending_ = input.readInt32();
               break;
             }
+            case 81: {
+
+              internalFragmentationFraction_ = input.readDouble();
+              break;
+            }
+            case 88: {
+
+              useCudaMallocAsync_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -1880,6 +1916,40 @@ public int getKernelTrackerMaxPending() {
       return kernelTrackerMaxPending_;
     }
 
+    public static final int INTERNAL_FRAGMENTATION_FRACTION_FIELD_NUMBER = 10;
+    private double internalFragmentationFraction_;
+    /**
+     * <pre>
+     * BFC Allocator can return an allocated chunk of memory upto 2x the
+     * requested size. For virtual devices with tight memory constraints, and
+     * proportionately large allocation requests, this can lead to a significant
+     * reduction in available memory. The threshold below controls when a chunk
+     * should be split if the chunk size exceeds requested memory size. It is
+     * expressed as a fraction of total available memory for the tf device. For
+     * example setting it to 0.05 would imply a chunk needs to be split if its
+     * size exceeds the requested memory by 5% of the total virtual device/gpu
+     * memory size.
+     * </pre>
+     *
+     * <code>double internal_fragmentation_fraction = 10;</code>
+     */
+    public double getInternalFragmentationFraction() {
+      return internalFragmentationFraction_;
+    }
+
+    public static final int USE_CUDA_MALLOC_ASYNC_FIELD_NUMBER = 11;
+    private boolean useCudaMallocAsync_;
+    /**
+     * <pre>
+     * When true, use CUDA cudaMallocAsync API instead of TF gpu allocator.
+     * </pre>
+     *
+     * <code>bool use_cuda_malloc_async = 11;</code>
+     */
+    public boolean getUseCudaMallocAsync() {
+      return useCudaMallocAsync_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1918,6 +1988,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (kernelTrackerMaxPending_ != 0) {
         output.writeInt32(9, kernelTrackerMaxPending_);
       }
+      if (internalFragmentationFraction_ != 0D) {
+        output.writeDouble(10, internalFragmentationFraction_);
+      }
+      if (useCudaMallocAsync_ != false) {
+        output.writeBool(11, useCudaMallocAsync_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -1958,6 +2034,14 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(9, kernelTrackerMaxPending_);
       }
+      if (internalFragmentationFraction_ != 0D) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(10, internalFragmentationFraction_);
+      }
+      if (useCudaMallocAsync_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, useCudaMallocAsync_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1989,6 +2073,11 @@ public boolean equals(final java.lang.Object obj) {
           != other.getKernelTrackerMaxBytes()) return false;
       if (getKernelTrackerMaxPending()
           != other.getKernelTrackerMaxPending()) return false;
+      if (java.lang.Double.doubleToLongBits(getInternalFragmentationFraction())
+          != java.lang.Double.doubleToLongBits(
+              other.getInternalFragmentationFraction())) return false;
+      if (getUseCudaMallocAsync()
+          != other.getUseCudaMallocAsync()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -2020,6 +2109,12 @@ public int hashCode() {
       hash = (53 * hash) + getKernelTrackerMaxBytes();
       hash = (37 * hash) + KERNEL_TRACKER_MAX_PENDING_FIELD_NUMBER;
       hash = (53 * hash) + getKernelTrackerMaxPending();
+      hash = (37 * hash) + INTERNAL_FRAGMENTATION_FRACTION_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          java.lang.Double.doubleToLongBits(getInternalFragmentationFraction()));
+      hash = (37 * hash) + USE_CUDA_MALLOC_ASYNC_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getUseCudaMallocAsync());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -2174,6 +2269,10 @@ public Builder clear() {
 
         kernelTrackerMaxPending_ = 0;
 
+        internalFragmentationFraction_ = 0D;
+
+        useCudaMallocAsync_ = false;
+
         return this;
       }
 
@@ -2217,6 +2316,8 @@ public org.tensorflow.proto.framework.GPUOptions.Experimental buildPartial() {
         result.kernelTrackerMaxInterval_ = kernelTrackerMaxInterval_;
         result.kernelTrackerMaxBytes_ = kernelTrackerMaxBytes_;
         result.kernelTrackerMaxPending_ = kernelTrackerMaxPending_;
+        result.internalFragmentationFraction_ = internalFragmentationFraction_;
+        result.useCudaMallocAsync_ = useCudaMallocAsync_;
         onBuilt();
         return result;
       }
@@ -2313,6 +2414,12 @@ public Builder mergeFrom(org.tensorflow.proto.framework.GPUOptions.Experimental
         if (other.getKernelTrackerMaxPending() != 0) {
           setKernelTrackerMaxPending(other.getKernelTrackerMaxPending());
         }
+        if (other.getInternalFragmentationFraction() != 0D) {
+          setInternalFragmentationFraction(other.getInternalFragmentationFraction());
+        }
+        if (other.getUseCudaMallocAsync() != false) {
+          setUseCudaMallocAsync(other.getUseCudaMallocAsync());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -3440,6 +3547,106 @@ public Builder clearKernelTrackerMaxPending() {
         onChanged();
         return this;
       }
+
+      private double internalFragmentationFraction_ ;
+      /**
+       * <pre>
+       * BFC Allocator can return an allocated chunk of memory upto 2x the
+       * requested size. For virtual devices with tight memory constraints, and
+       * proportionately large allocation requests, this can lead to a significant
+       * reduction in available memory. The threshold below controls when a chunk
+       * should be split if the chunk size exceeds requested memory size. It is
+       * expressed as a fraction of total available memory for the tf device. For
+       * example setting it to 0.05 would imply a chunk needs to be split if its
+       * size exceeds the requested memory by 5% of the total virtual device/gpu
+       * memory size.
+       * </pre>
+       *
+       * <code>double internal_fragmentation_fraction = 10;</code>
+       */
+      public double getInternalFragmentationFraction() {
+        return internalFragmentationFraction_;
+      }
+      /**
+       * <pre>
+       * BFC Allocator can return an allocated chunk of memory upto 2x the
+       * requested size. For virtual devices with tight memory constraints, and
+       * proportionately large allocation requests, this can lead to a significant
+       * reduction in available memory. The threshold below controls when a chunk
+       * should be split if the chunk size exceeds requested memory size. It is
+       * expressed as a fraction of total available memory for the tf device. For
+       * example setting it to 0.05 would imply a chunk needs to be split if its
+       * size exceeds the requested memory by 5% of the total virtual device/gpu
+       * memory size.
+       * </pre>
+       *
+       * <code>double internal_fragmentation_fraction = 10;</code>
+       */
+      public Builder setInternalFragmentationFraction(double value) {
+        
+        internalFragmentationFraction_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * BFC Allocator can return an allocated chunk of memory upto 2x the
+       * requested size. For virtual devices with tight memory constraints, and
+       * proportionately large allocation requests, this can lead to a significant
+       * reduction in available memory. The threshold below controls when a chunk
+       * should be split if the chunk size exceeds requested memory size. It is
+       * expressed as a fraction of total available memory for the tf device. For
+       * example setting it to 0.05 would imply a chunk needs to be split if its
+       * size exceeds the requested memory by 5% of the total virtual device/gpu
+       * memory size.
+       * </pre>
+       *
+       * <code>double internal_fragmentation_fraction = 10;</code>
+       */
+      public Builder clearInternalFragmentationFraction() {
+        
+        internalFragmentationFraction_ = 0D;
+        onChanged();
+        return this;
+      }
+
+      private boolean useCudaMallocAsync_ ;
+      /**
+       * <pre>
+       * When true, use CUDA cudaMallocAsync API instead of TF gpu allocator.
+       * </pre>
+       *
+       * <code>bool use_cuda_malloc_async = 11;</code>
+       */
+      public boolean getUseCudaMallocAsync() {
+        return useCudaMallocAsync_;
+      }
+      /**
+       * <pre>
+       * When true, use CUDA cudaMallocAsync API instead of TF gpu allocator.
+       * </pre>
+       *
+       * <code>bool use_cuda_malloc_async = 11;</code>
+       */
+      public Builder setUseCudaMallocAsync(boolean value) {
+        
+        useCudaMallocAsync_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * When true, use CUDA cudaMallocAsync API instead of TF gpu allocator.
+       * </pre>
+       *
+       * <code>bool use_cuda_malloc_async = 11;</code>
+       */
+      public Builder clearUseCudaMallocAsync() {
+        
+        useCudaMallocAsync_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDef.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDef.java
index 958471427f3..ce9b08d33be 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDef.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDef.java
@@ -149,6 +149,11 @@ private OpDef(
             controlOutput_.add(s);
             break;
           }
+          case 168: {
+
+            isDistributedCommunication_ = input.readBool();
+            break;
+          }
           default: {
             if (!parseUnknownField(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -378,6 +383,52 @@ org.tensorflow.proto.framework.ResourceHandleProto.DtypeAndShapeOrBuilder getHan
      * <code>bool is_ref = 16;</code>
      */
     boolean getIsRef();
+
+    /**
+     * <pre>
+     * Experimental. Full type declaration for this argument.
+     * The full type specification combines type, type_attr, type_list_attr,
+     * etc. into a unified representation.
+     * This declaration may contain non-concrete types (for example,
+     * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+     * Note: this is a transient field. The long-term aim is to represent the
+     * entire OpDef as a single type: a callable. In that context, this field is
+     * just the type of a single argument.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+     */
+    boolean hasExperimentalFullType();
+    /**
+     * <pre>
+     * Experimental. Full type declaration for this argument.
+     * The full type specification combines type, type_attr, type_list_attr,
+     * etc. into a unified representation.
+     * This declaration may contain non-concrete types (for example,
+     * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+     * Note: this is a transient field. The long-term aim is to represent the
+     * entire OpDef as a single type: a callable. In that context, this field is
+     * just the type of a single argument.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+     */
+    org.tensorflow.proto.framework.FullTypeDef getExperimentalFullType();
+    /**
+     * <pre>
+     * Experimental. Full type declaration for this argument.
+     * The full type specification combines type, type_attr, type_list_attr,
+     * etc. into a unified representation.
+     * This declaration may contain non-concrete types (for example,
+     * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+     * Note: this is a transient field. The long-term aim is to represent the
+     * entire OpDef as a single type: a callable. In that context, this field is
+     * just the type of a single argument.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+     */
+    org.tensorflow.proto.framework.FullTypeDefOrBuilder getExperimentalFullTypeOrBuilder();
   }
   /**
    * <pre>
@@ -486,6 +537,19 @@ private ArgDef(
               isRef_ = input.readBool();
               break;
             }
+            case 138: {
+              org.tensorflow.proto.framework.FullTypeDef.Builder subBuilder = null;
+              if (experimentalFullType_ != null) {
+                subBuilder = experimentalFullType_.toBuilder();
+              }
+              experimentalFullType_ = input.readMessage(org.tensorflow.proto.framework.FullTypeDef.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(experimentalFullType_);
+                experimentalFullType_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -846,6 +910,60 @@ public boolean getIsRef() {
       return isRef_;
     }
 
+    public static final int EXPERIMENTAL_FULL_TYPE_FIELD_NUMBER = 17;
+    private org.tensorflow.proto.framework.FullTypeDef experimentalFullType_;
+    /**
+     * <pre>
+     * Experimental. Full type declaration for this argument.
+     * The full type specification combines type, type_attr, type_list_attr,
+     * etc. into a unified representation.
+     * This declaration may contain non-concrete types (for example,
+     * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+     * Note: this is a transient field. The long-term aim is to represent the
+     * entire OpDef as a single type: a callable. In that context, this field is
+     * just the type of a single argument.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+     */
+    public boolean hasExperimentalFullType() {
+      return experimentalFullType_ != null;
+    }
+    /**
+     * <pre>
+     * Experimental. Full type declaration for this argument.
+     * The full type specification combines type, type_attr, type_list_attr,
+     * etc. into a unified representation.
+     * This declaration may contain non-concrete types (for example,
+     * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+     * Note: this is a transient field. The long-term aim is to represent the
+     * entire OpDef as a single type: a callable. In that context, this field is
+     * just the type of a single argument.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+     */
+    public org.tensorflow.proto.framework.FullTypeDef getExperimentalFullType() {
+      return experimentalFullType_ == null ? org.tensorflow.proto.framework.FullTypeDef.getDefaultInstance() : experimentalFullType_;
+    }
+    /**
+     * <pre>
+     * Experimental. Full type declaration for this argument.
+     * The full type specification combines type, type_attr, type_list_attr,
+     * etc. into a unified representation.
+     * This declaration may contain non-concrete types (for example,
+     * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+     * Note: this is a transient field. The long-term aim is to represent the
+     * entire OpDef as a single type: a callable. In that context, this field is
+     * just the type of a single argument.
+     * </pre>
+     *
+     * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+     */
+    public org.tensorflow.proto.framework.FullTypeDefOrBuilder getExperimentalFullTypeOrBuilder() {
+      return getExperimentalFullType();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -884,6 +1002,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (isRef_ != false) {
         output.writeBool(16, isRef_);
       }
+      if (experimentalFullType_ != null) {
+        output.writeMessage(17, getExperimentalFullType());
+      }
       unknownFields.writeTo(output);
     }
 
@@ -920,6 +1041,10 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(16, isRef_);
       }
+      if (experimentalFullType_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(17, getExperimentalFullType());
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -950,6 +1075,11 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getHandleDataList())) return false;
       if (getIsRef()
           != other.getIsRef()) return false;
+      if (hasExperimentalFullType() != other.hasExperimentalFullType()) return false;
+      if (hasExperimentalFullType()) {
+        if (!getExperimentalFullType()
+            .equals(other.getExperimentalFullType())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -980,6 +1110,10 @@ public int hashCode() {
       hash = (37 * hash) + IS_REF_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsRef());
+      if (hasExperimentalFullType()) {
+        hash = (37 * hash) + EXPERIMENTAL_FULL_TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + getExperimentalFullType().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1138,6 +1272,12 @@ public Builder clear() {
         }
         isRef_ = false;
 
+        if (experimentalFullTypeBuilder_ == null) {
+          experimentalFullType_ = null;
+        } else {
+          experimentalFullType_ = null;
+          experimentalFullTypeBuilder_ = null;
+        }
         return this;
       }
 
@@ -1181,6 +1321,11 @@ public org.tensorflow.proto.framework.OpDef.ArgDef buildPartial() {
           result.handleData_ = handleDataBuilder_.build();
         }
         result.isRef_ = isRef_;
+        if (experimentalFullTypeBuilder_ == null) {
+          result.experimentalFullType_ = experimentalFullType_;
+        } else {
+          result.experimentalFullType_ = experimentalFullTypeBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -1281,6 +1426,9 @@ public Builder mergeFrom(org.tensorflow.proto.framework.OpDef.ArgDef other) {
         if (other.getIsRef() != false) {
           setIsRef(other.getIsRef());
         }
+        if (other.hasExperimentalFullType()) {
+          mergeExperimentalFullType(other.getExperimentalFullType());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -2226,6 +2374,222 @@ public Builder clearIsRef() {
         onChanged();
         return this;
       }
+
+      private org.tensorflow.proto.framework.FullTypeDef experimentalFullType_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          org.tensorflow.proto.framework.FullTypeDef, org.tensorflow.proto.framework.FullTypeDef.Builder, org.tensorflow.proto.framework.FullTypeDefOrBuilder> experimentalFullTypeBuilder_;
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      public boolean hasExperimentalFullType() {
+        return experimentalFullTypeBuilder_ != null || experimentalFullType_ != null;
+      }
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      public org.tensorflow.proto.framework.FullTypeDef getExperimentalFullType() {
+        if (experimentalFullTypeBuilder_ == null) {
+          return experimentalFullType_ == null ? org.tensorflow.proto.framework.FullTypeDef.getDefaultInstance() : experimentalFullType_;
+        } else {
+          return experimentalFullTypeBuilder_.getMessage();
+        }
+      }
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      public Builder setExperimentalFullType(org.tensorflow.proto.framework.FullTypeDef value) {
+        if (experimentalFullTypeBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          experimentalFullType_ = value;
+          onChanged();
+        } else {
+          experimentalFullTypeBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      public Builder setExperimentalFullType(
+          org.tensorflow.proto.framework.FullTypeDef.Builder builderForValue) {
+        if (experimentalFullTypeBuilder_ == null) {
+          experimentalFullType_ = builderForValue.build();
+          onChanged();
+        } else {
+          experimentalFullTypeBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      public Builder mergeExperimentalFullType(org.tensorflow.proto.framework.FullTypeDef value) {
+        if (experimentalFullTypeBuilder_ == null) {
+          if (experimentalFullType_ != null) {
+            experimentalFullType_ =
+              org.tensorflow.proto.framework.FullTypeDef.newBuilder(experimentalFullType_).mergeFrom(value).buildPartial();
+          } else {
+            experimentalFullType_ = value;
+          }
+          onChanged();
+        } else {
+          experimentalFullTypeBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      public Builder clearExperimentalFullType() {
+        if (experimentalFullTypeBuilder_ == null) {
+          experimentalFullType_ = null;
+          onChanged();
+        } else {
+          experimentalFullType_ = null;
+          experimentalFullTypeBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      public org.tensorflow.proto.framework.FullTypeDef.Builder getExperimentalFullTypeBuilder() {
+        
+        onChanged();
+        return getExperimentalFullTypeFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      public org.tensorflow.proto.framework.FullTypeDefOrBuilder getExperimentalFullTypeOrBuilder() {
+        if (experimentalFullTypeBuilder_ != null) {
+          return experimentalFullTypeBuilder_.getMessageOrBuilder();
+        } else {
+          return experimentalFullType_ == null ?
+              org.tensorflow.proto.framework.FullTypeDef.getDefaultInstance() : experimentalFullType_;
+        }
+      }
+      /**
+       * <pre>
+       * Experimental. Full type declaration for this argument.
+       * The full type specification combines type, type_attr, type_list_attr,
+       * etc. into a unified representation.
+       * This declaration may contain non-concrete types (for example,
+       * Tensor&lt;TypeVar&lt;'T'&gt;&gt; is a valid type declaration.
+       * Note: this is a transient field. The long-term aim is to represent the
+       * entire OpDef as a single type: a callable. In that context, this field is
+       * just the type of a single argument.
+       * </pre>
+       *
+       * <code>.tensorflow.FullTypeDef experimental_full_type = 17;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          org.tensorflow.proto.framework.FullTypeDef, org.tensorflow.proto.framework.FullTypeDef.Builder, org.tensorflow.proto.framework.FullTypeDefOrBuilder> 
+          getExperimentalFullTypeFieldBuilder() {
+        if (experimentalFullTypeBuilder_ == null) {
+          experimentalFullTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              org.tensorflow.proto.framework.FullTypeDef, org.tensorflow.proto.framework.FullTypeDef.Builder, org.tensorflow.proto.framework.FullTypeDefOrBuilder>(
+                  getExperimentalFullType(),
+                  getParentForChildren(),
+                  isClean());
+          experimentalFullType_ = null;
+        }
+        return experimentalFullTypeBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -4430,6 +4794,21 @@ public boolean getAllowsUninitializedInput() {
     return allowsUninitializedInput_;
   }
 
+  public static final int IS_DISTRIBUTED_COMMUNICATION_FIELD_NUMBER = 21;
+  private boolean isDistributedCommunication_;
+  /**
+   * <pre>
+   * Indicates whether the op implementation uses distributed communication.
+   * If True, the op is allowed to return errors for network disconnection and
+   * trigger TF network failure handling logics.
+   * </pre>
+   *
+   * <code>bool is_distributed_communication = 21;</code>
+   */
+  public boolean getIsDistributedCommunication() {
+    return isDistributedCommunication_;
+  }
+
   private byte memoizedIsInitialized = -1;
   @java.lang.Override
   public final boolean isInitialized() {
@@ -4480,6 +4859,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     for (int i = 0; i < controlOutput_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 20, controlOutput_.getRaw(i));
     }
+    if (isDistributedCommunication_ != false) {
+      output.writeBool(21, isDistributedCommunication_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -4538,6 +4920,10 @@ public int getSerializedSize() {
       size += dataSize;
       size += 2 * getControlOutputList().size();
     }
+    if (isDistributedCommunication_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(21, isDistributedCommunication_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -4580,6 +4966,8 @@ public boolean equals(final java.lang.Object obj) {
         != other.getIsStateful()) return false;
     if (getAllowsUninitializedInput()
         != other.getAllowsUninitializedInput()) return false;
+    if (getIsDistributedCommunication()
+        != other.getIsDistributedCommunication()) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -4629,6 +5017,9 @@ public int hashCode() {
     hash = (37 * hash) + ALLOWS_UNINITIALIZED_INPUT_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
         getAllowsUninitializedInput());
+    hash = (37 * hash) + IS_DISTRIBUTED_COMMUNICATION_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getIsDistributedCommunication());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -4811,6 +5202,8 @@ public Builder clear() {
 
       allowsUninitializedInput_ = false;
 
+      isDistributedCommunication_ = false;
+
       return this;
     }
 
@@ -4882,6 +5275,7 @@ public org.tensorflow.proto.framework.OpDef buildPartial() {
       result.isAggregate_ = isAggregate_;
       result.isStateful_ = isStateful_;
       result.allowsUninitializedInput_ = allowsUninitializedInput_;
+      result.isDistributedCommunication_ = isDistributedCommunication_;
       onBuilt();
       return result;
     }
@@ -5045,6 +5439,9 @@ public Builder mergeFrom(org.tensorflow.proto.framework.OpDef other) {
       if (other.getAllowsUninitializedInput() != false) {
         setAllowsUninitializedInput(other.getAllowsUninitializedInput());
       }
+      if (other.getIsDistributedCommunication() != false) {
+        setIsDistributedCommunication(other.getIsDistributedCommunication());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -6711,6 +7108,50 @@ public Builder clearAllowsUninitializedInput() {
       onChanged();
       return this;
     }
+
+    private boolean isDistributedCommunication_ ;
+    /**
+     * <pre>
+     * Indicates whether the op implementation uses distributed communication.
+     * If True, the op is allowed to return errors for network disconnection and
+     * trigger TF network failure handling logics.
+     * </pre>
+     *
+     * <code>bool is_distributed_communication = 21;</code>
+     */
+    public boolean getIsDistributedCommunication() {
+      return isDistributedCommunication_;
+    }
+    /**
+     * <pre>
+     * Indicates whether the op implementation uses distributed communication.
+     * If True, the op is allowed to return errors for network disconnection and
+     * trigger TF network failure handling logics.
+     * </pre>
+     *
+     * <code>bool is_distributed_communication = 21;</code>
+     */
+    public Builder setIsDistributedCommunication(boolean value) {
+      
+      isDistributedCommunication_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Indicates whether the op implementation uses distributed communication.
+     * If True, the op is allowed to return errors for network disconnection and
+     * trigger TF network failure handling logics.
+     * </pre>
+     *
+     * <code>bool is_distributed_communication = 21;</code>
+     */
+    public Builder clearIsDistributedCommunication() {
+      
+      isDistributedCommunication_ = false;
+      onChanged();
+      return this;
+    }
     @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDefOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDefOrBuilder.java
index 6ac64c0ed97..1e986459b37 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDefOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDefOrBuilder.java
@@ -293,4 +293,15 @@ org.tensorflow.proto.framework.OpDef.AttrDefOrBuilder getAttrOrBuilder(
    * <code>bool allows_uninitialized_input = 19;</code>
    */
   boolean getAllowsUninitializedInput();
+
+  /**
+   * <pre>
+   * Indicates whether the op implementation uses distributed communication.
+   * If True, the op is allowed to return errors for network disconnection and
+   * trigger TF network failure handling logics.
+   * </pre>
+   *
+   * <code>bool is_distributed_communication = 21;</code>
+   */
+  boolean getIsDistributedCommunication();
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDefProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDefProtos.java
index e56b212a6a6..9fe8b27832c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDefProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OpDefProtos.java
@@ -50,55 +50,59 @@ public static void registerAllExtensions(
     java.lang.String[] descriptorData = {
       "\n&tensorflow/core/framework/op_def.proto" +
       "\022\ntensorflow\032*tensorflow/core/framework/" +
-      "attr_value.proto\032%tensorflow/core/framew" +
-      "ork/types.proto\032/tensorflow/core/framewo" +
-      "rk/resource_handle.proto\"\224\006\n\005OpDef\022\014\n\004na" +
-      "me\030\001 \001(\t\022+\n\tinput_arg\030\002 \003(\0132\030.tensorflow" +
-      ".OpDef.ArgDef\022,\n\noutput_arg\030\003 \003(\0132\030.tens" +
-      "orflow.OpDef.ArgDef\022\026\n\016control_output\030\024 " +
-      "\003(\t\022\'\n\004attr\030\004 \003(\0132\031.tensorflow.OpDef.Att" +
-      "rDef\022.\n\013deprecation\030\010 \001(\0132\031.tensorflow.O" +
-      "pDeprecation\022\017\n\007summary\030\005 \001(\t\022\023\n\013descrip" +
-      "tion\030\006 \001(\t\022\026\n\016is_commutative\030\022 \001(\010\022\024\n\014is" +
-      "_aggregate\030\020 \001(\010\022\023\n\013is_stateful\030\021 \001(\010\022\"\n" +
-      "\032allows_uninitialized_input\030\023 \001(\010\032\343\001\n\006Ar" +
-      "gDef\022\014\n\004name\030\001 \001(\t\022\023\n\013description\030\002 \001(\t\022" +
-      "\"\n\004type\030\003 \001(\0162\024.tensorflow.DataType\022\021\n\tt" +
-      "ype_attr\030\004 \001(\t\022\023\n\013number_attr\030\005 \001(\t\022\026\n\016t" +
-      "ype_list_attr\030\006 \001(\t\022B\n\013handle_data\030\007 \003(\013" +
-      "2-.tensorflow.ResourceHandleProto.DtypeA" +
-      "ndShape\022\016\n\006is_ref\030\020 \001(\010\032\275\001\n\007AttrDef\022\014\n\004n" +
-      "ame\030\001 \001(\t\022\014\n\004type\030\002 \001(\t\022,\n\rdefault_value" +
-      "\030\003 \001(\0132\025.tensorflow.AttrValue\022\023\n\013descrip" +
-      "tion\030\004 \001(\t\022\023\n\013has_minimum\030\005 \001(\010\022\017\n\007minim" +
-      "um\030\006 \001(\003\022-\n\016allowed_values\030\007 \001(\0132\025.tenso" +
-      "rflow.AttrValue\"5\n\rOpDeprecation\022\017\n\007vers" +
-      "ion\030\001 \001(\005\022\023\n\013explanation\030\002 \001(\t\"\'\n\006OpList" +
-      "\022\035\n\002op\030\001 \003(\0132\021.tensorflow.OpDefB\201\001\n\036org." +
-      "tensorflow.proto.frameworkB\013OpDefProtosP" +
-      "\001ZMgithub.com/tensorflow/tensorflow/tens" +
-      "orflow/go/core/framework/op_def_go_proto" +
-      "\370\001\001b\006proto3"
+      "attr_value.proto\032)tensorflow/core/framew" +
+      "ork/full_type.proto\032/tensorflow/core/fra" +
+      "mework/resource_handle.proto\032%tensorflow" +
+      "/core/framework/types.proto\"\363\006\n\005OpDef\022\014\n" +
+      "\004name\030\001 \001(\t\022+\n\tinput_arg\030\002 \003(\0132\030.tensorf" +
+      "low.OpDef.ArgDef\022,\n\noutput_arg\030\003 \003(\0132\030.t" +
+      "ensorflow.OpDef.ArgDef\022\026\n\016control_output" +
+      "\030\024 \003(\t\022\'\n\004attr\030\004 \003(\0132\031.tensorflow.OpDef." +
+      "AttrDef\022.\n\013deprecation\030\010 \001(\0132\031.tensorflo" +
+      "w.OpDeprecation\022\017\n\007summary\030\005 \001(\t\022\023\n\013desc" +
+      "ription\030\006 \001(\t\022\026\n\016is_commutative\030\022 \001(\010\022\024\n" +
+      "\014is_aggregate\030\020 \001(\010\022\023\n\013is_stateful\030\021 \001(\010" +
+      "\022\"\n\032allows_uninitialized_input\030\023 \001(\010\022$\n\034" +
+      "is_distributed_communication\030\025 \001(\010\032\234\002\n\006A" +
+      "rgDef\022\014\n\004name\030\001 \001(\t\022\023\n\013description\030\002 \001(\t" +
+      "\022\"\n\004type\030\003 \001(\0162\024.tensorflow.DataType\022\021\n\t" +
+      "type_attr\030\004 \001(\t\022\023\n\013number_attr\030\005 \001(\t\022\026\n\016" +
+      "type_list_attr\030\006 \001(\t\022B\n\013handle_data\030\007 \003(" +
+      "\0132-.tensorflow.ResourceHandleProto.Dtype" +
+      "AndShape\022\016\n\006is_ref\030\020 \001(\010\0227\n\026experimental" +
+      "_full_type\030\021 \001(\0132\027.tensorflow.FullTypeDe" +
+      "f\032\275\001\n\007AttrDef\022\014\n\004name\030\001 \001(\t\022\014\n\004type\030\002 \001(" +
+      "\t\022,\n\rdefault_value\030\003 \001(\0132\025.tensorflow.At" +
+      "trValue\022\023\n\013description\030\004 \001(\t\022\023\n\013has_mini" +
+      "mum\030\005 \001(\010\022\017\n\007minimum\030\006 \001(\003\022-\n\016allowed_va" +
+      "lues\030\007 \001(\0132\025.tensorflow.AttrValue\"5\n\rOpD" +
+      "eprecation\022\017\n\007version\030\001 \001(\005\022\023\n\013explanati" +
+      "on\030\002 \001(\t\"\'\n\006OpList\022\035\n\002op\030\001 \003(\0132\021.tensorf" +
+      "low.OpDefB\201\001\n\036org.tensorflow.proto.frame" +
+      "workB\013OpDefProtosP\001ZMgithub.com/tensorfl" +
+      "ow/tensorflow/tensorflow/go/core/framewo" +
+      "rk/op_def_go_proto\370\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           org.tensorflow.proto.framework.AttrValueProtos.getDescriptor(),
-          org.tensorflow.proto.framework.TypesProtos.getDescriptor(),
+          org.tensorflow.proto.framework.FullTypeProtos.getDescriptor(),
           org.tensorflow.proto.framework.ResourceHandle.getDescriptor(),
+          org.tensorflow.proto.framework.TypesProtos.getDescriptor(),
         });
     internal_static_tensorflow_OpDef_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_tensorflow_OpDef_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_OpDef_descriptor,
-        new java.lang.String[] { "Name", "InputArg", "OutputArg", "ControlOutput", "Attr", "Deprecation", "Summary", "Description", "IsCommutative", "IsAggregate", "IsStateful", "AllowsUninitializedInput", });
+        new java.lang.String[] { "Name", "InputArg", "OutputArg", "ControlOutput", "Attr", "Deprecation", "Summary", "Description", "IsCommutative", "IsAggregate", "IsStateful", "AllowsUninitializedInput", "IsDistributedCommunication", });
     internal_static_tensorflow_OpDef_ArgDef_descriptor =
       internal_static_tensorflow_OpDef_descriptor.getNestedTypes().get(0);
     internal_static_tensorflow_OpDef_ArgDef_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_OpDef_ArgDef_descriptor,
-        new java.lang.String[] { "Name", "Description", "Type", "TypeAttr", "NumberAttr", "TypeListAttr", "HandleData", "IsRef", });
+        new java.lang.String[] { "Name", "Description", "Type", "TypeAttr", "NumberAttr", "TypeListAttr", "HandleData", "IsRef", "ExperimentalFullType", });
     internal_static_tensorflow_OpDef_AttrDef_descriptor =
       internal_static_tensorflow_OpDef_descriptor.getNestedTypes().get(1);
     internal_static_tensorflow_OpDef_AttrDef_fieldAccessorTable = new
@@ -118,8 +122,9 @@ public static void registerAllExtensions(
         internal_static_tensorflow_OpList_descriptor,
         new java.lang.String[] { "Op", });
     org.tensorflow.proto.framework.AttrValueProtos.getDescriptor();
-    org.tensorflow.proto.framework.TypesProtos.getDescriptor();
+    org.tensorflow.proto.framework.FullTypeProtos.getDescriptor();
     org.tensorflow.proto.framework.ResourceHandle.getDescriptor();
+    org.tensorflow.proto.framework.TypesProtos.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OptimizerOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OptimizerOptions.java
index 2afa5a96067..3888c9c9ee6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OptimizerOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OptimizerOptions.java
@@ -389,6 +389,9 @@ private GlobalJitLevel(int value) {
   /**
    * <pre>
    * If true, optimize the graph using common subexpression elimination.
+   * Note: the optimization Level L1 will override this setting to true. So in
+   * order to disable common subexpression elimination the opt_level has to be
+   * set to L0.
    * </pre>
    *
    * <code>bool do_common_subexpression_elimination = 1;</code>
@@ -402,6 +405,8 @@ public boolean getDoCommonSubexpressionElimination() {
   /**
    * <pre>
    * If true, perform constant folding optimization on the graph.
+   * Note: the optimization Level L1 will override this setting to true. So in
+   * order to disable constant folding the opt_level has to be set to L0.
    * </pre>
    *
    * <code>bool do_constant_folding = 2;</code>
@@ -881,6 +886,9 @@ public Builder mergeFrom(
     /**
      * <pre>
      * If true, optimize the graph using common subexpression elimination.
+     * Note: the optimization Level L1 will override this setting to true. So in
+     * order to disable common subexpression elimination the opt_level has to be
+     * set to L0.
      * </pre>
      *
      * <code>bool do_common_subexpression_elimination = 1;</code>
@@ -891,6 +899,9 @@ public boolean getDoCommonSubexpressionElimination() {
     /**
      * <pre>
      * If true, optimize the graph using common subexpression elimination.
+     * Note: the optimization Level L1 will override this setting to true. So in
+     * order to disable common subexpression elimination the opt_level has to be
+     * set to L0.
      * </pre>
      *
      * <code>bool do_common_subexpression_elimination = 1;</code>
@@ -904,6 +915,9 @@ public Builder setDoCommonSubexpressionElimination(boolean value) {
     /**
      * <pre>
      * If true, optimize the graph using common subexpression elimination.
+     * Note: the optimization Level L1 will override this setting to true. So in
+     * order to disable common subexpression elimination the opt_level has to be
+     * set to L0.
      * </pre>
      *
      * <code>bool do_common_subexpression_elimination = 1;</code>
@@ -919,6 +933,8 @@ public Builder clearDoCommonSubexpressionElimination() {
     /**
      * <pre>
      * If true, perform constant folding optimization on the graph.
+     * Note: the optimization Level L1 will override this setting to true. So in
+     * order to disable constant folding the opt_level has to be set to L0.
      * </pre>
      *
      * <code>bool do_constant_folding = 2;</code>
@@ -929,6 +945,8 @@ public boolean getDoConstantFolding() {
     /**
      * <pre>
      * If true, perform constant folding optimization on the graph.
+     * Note: the optimization Level L1 will override this setting to true. So in
+     * order to disable constant folding the opt_level has to be set to L0.
      * </pre>
      *
      * <code>bool do_constant_folding = 2;</code>
@@ -942,6 +960,8 @@ public Builder setDoConstantFolding(boolean value) {
     /**
      * <pre>
      * If true, perform constant folding optimization on the graph.
+     * Note: the optimization Level L1 will override this setting to true. So in
+     * order to disable constant folding the opt_level has to be set to L0.
      * </pre>
      *
      * <code>bool do_constant_folding = 2;</code>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OptimizerOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OptimizerOptionsOrBuilder.java
index 255ace49e05..0b2916cedad 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OptimizerOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/OptimizerOptionsOrBuilder.java
@@ -10,6 +10,9 @@ public interface OptimizerOptionsOrBuilder extends
   /**
    * <pre>
    * If true, optimize the graph using common subexpression elimination.
+   * Note: the optimization Level L1 will override this setting to true. So in
+   * order to disable common subexpression elimination the opt_level has to be
+   * set to L0.
    * </pre>
    *
    * <code>bool do_common_subexpression_elimination = 1;</code>
@@ -19,6 +22,8 @@ public interface OptimizerOptionsOrBuilder extends
   /**
    * <pre>
    * If true, perform constant folding optimization on the graph.
+   * Note: the optimization Level L1 will override this setting to true. So in
+   * order to disable constant folding the opt_level has to be set to L0.
    * </pre>
    *
    * <code>bool do_constant_folding = 2;</code>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RPCOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RPCOptions.java
index 6c1a717876d..10aae53345a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RPCOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RPCOptions.java
@@ -75,6 +75,11 @@ private RPCOptions(
             disableSessionConnectionSharing_ = input.readBool();
             break;
           }
+          case 48: {
+
+            numChannelsPerTarget_ = input.readInt32();
+            break;
+          }
           default: {
             if (!parseUnknownField(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -210,6 +215,24 @@ public boolean getDisableSessionConnectionSharing() {
     return disableSessionConnectionSharing_;
   }
 
+  public static final int NUM_CHANNELS_PER_TARGET_FIELD_NUMBER = 6;
+  private int numChannelsPerTarget_;
+  /**
+   * <pre>
+   * Setting num_channels_per_target &gt; 0 allows uses of multiple channels to
+   * communicate to the same target. This can be used to improve the aggregate
+   * throughput on high speed links (e.g 100G) where single connection is not
+   * sufficient to maximize link utilization. Note that a single RPC only goes
+   * on a single channel, this only helps in situations where there are multiple
+   * transfers to the same target overlapping in time.
+   * </pre>
+   *
+   * <code>int32 num_channels_per_target = 6;</code>
+   */
+  public int getNumChannelsPerTarget() {
+    return numChannelsPerTarget_;
+  }
+
   private byte memoizedIsInitialized = -1;
   @java.lang.Override
   public final boolean isInitialized() {
@@ -239,6 +262,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (disableSessionConnectionSharing_ != false) {
       output.writeBool(5, disableSessionConnectionSharing_);
     }
+    if (numChannelsPerTarget_ != 0) {
+      output.writeInt32(6, numChannelsPerTarget_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -267,6 +293,10 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(5, disableSessionConnectionSharing_);
     }
+    if (numChannelsPerTarget_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(6, numChannelsPerTarget_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -292,6 +322,8 @@ public boolean equals(final java.lang.Object obj) {
         != other.getCacheRpcResponse()) return false;
     if (getDisableSessionConnectionSharing()
         != other.getDisableSessionConnectionSharing()) return false;
+    if (getNumChannelsPerTarget()
+        != other.getNumChannelsPerTarget()) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -316,6 +348,8 @@ public int hashCode() {
     hash = (37 * hash) + DISABLE_SESSION_CONNECTION_SHARING_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
         getDisableSessionConnectionSharing());
+    hash = (37 * hash) + NUM_CHANNELS_PER_TARGET_FIELD_NUMBER;
+    hash = (53 * hash) + getNumChannelsPerTarget();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -459,6 +493,8 @@ public Builder clear() {
 
       disableSessionConnectionSharing_ = false;
 
+      numChannelsPerTarget_ = 0;
+
       return this;
     }
 
@@ -490,6 +526,7 @@ public org.tensorflow.proto.framework.RPCOptions buildPartial() {
       result.compressionLevel_ = compressionLevel_;
       result.cacheRpcResponse_ = cacheRpcResponse_;
       result.disableSessionConnectionSharing_ = disableSessionConnectionSharing_;
+      result.numChannelsPerTarget_ = numChannelsPerTarget_;
       onBuilt();
       return result;
     }
@@ -554,6 +591,9 @@ public Builder mergeFrom(org.tensorflow.proto.framework.RPCOptions other) {
       if (other.getDisableSessionConnectionSharing() != false) {
         setDisableSessionConnectionSharing(other.getDisableSessionConnectionSharing());
       }
+      if (other.getNumChannelsPerTarget() != 0) {
+        setNumChannelsPerTarget(other.getNumChannelsPerTarget());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -850,6 +890,59 @@ public Builder clearDisableSessionConnectionSharing() {
       onChanged();
       return this;
     }
+
+    private int numChannelsPerTarget_ ;
+    /**
+     * <pre>
+     * Setting num_channels_per_target &gt; 0 allows uses of multiple channels to
+     * communicate to the same target. This can be used to improve the aggregate
+     * throughput on high speed links (e.g 100G) where single connection is not
+     * sufficient to maximize link utilization. Note that a single RPC only goes
+     * on a single channel, this only helps in situations where there are multiple
+     * transfers to the same target overlapping in time.
+     * </pre>
+     *
+     * <code>int32 num_channels_per_target = 6;</code>
+     */
+    public int getNumChannelsPerTarget() {
+      return numChannelsPerTarget_;
+    }
+    /**
+     * <pre>
+     * Setting num_channels_per_target &gt; 0 allows uses of multiple channels to
+     * communicate to the same target. This can be used to improve the aggregate
+     * throughput on high speed links (e.g 100G) where single connection is not
+     * sufficient to maximize link utilization. Note that a single RPC only goes
+     * on a single channel, this only helps in situations where there are multiple
+     * transfers to the same target overlapping in time.
+     * </pre>
+     *
+     * <code>int32 num_channels_per_target = 6;</code>
+     */
+    public Builder setNumChannelsPerTarget(int value) {
+      
+      numChannelsPerTarget_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * Setting num_channels_per_target &gt; 0 allows uses of multiple channels to
+     * communicate to the same target. This can be used to improve the aggregate
+     * throughput on high speed links (e.g 100G) where single connection is not
+     * sufficient to maximize link utilization. Note that a single RPC only goes
+     * on a single channel, this only helps in situations where there are multiple
+     * transfers to the same target overlapping in time.
+     * </pre>
+     *
+     * <code>int32 num_channels_per_target = 6;</code>
+     */
+    public Builder clearNumChannelsPerTarget() {
+      
+      numChannelsPerTarget_ = 0;
+      onChanged();
+      return this;
+    }
     @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RPCOptionsOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RPCOptionsOrBuilder.java
index e7178532c17..f1309265632 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RPCOptionsOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RPCOptionsOrBuilder.java
@@ -69,4 +69,18 @@ public interface RPCOptionsOrBuilder extends
    * <code>bool disable_session_connection_sharing = 5;</code>
    */
   boolean getDisableSessionConnectionSharing();
+
+  /**
+   * <pre>
+   * Setting num_channels_per_target &gt; 0 allows uses of multiple channels to
+   * communicate to the same target. This can be used to improve the aggregate
+   * throughput on high speed links (e.g 100G) where single connection is not
+   * sufficient to maximize link utilization. Note that a single RPC only goes
+   * on a single channel, this only helps in situations where there are multiple
+   * transfers to the same target overlapping in time.
+   * </pre>
+   *
+   * <code>int32 num_channels_per_target = 6;</code>
+   */
+  int getNumChannelsPerTarget();
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RegisteredGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RegisteredGradient.java
new file mode 100644
index 00000000000..edb975087bf
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RegisteredGradient.java
@@ -0,0 +1,743 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tensorflow/core/framework/function.proto
+
+package org.tensorflow.proto.framework;
+
+/**
+ * <pre>
+ * RegisteredGradient stores a gradient function that is registered in the
+ * gradients library and used in the ops of a function in the function library.
+ * Unlike GradientDef, these gradients are identified by op type, and not
+ * directly linked to any function.
+ * </pre>
+ *
+ * Protobuf type {@code tensorflow.RegisteredGradient}
+ */
+public  final class RegisteredGradient extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:tensorflow.RegisteredGradient)
+    RegisteredGradientOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use RegisteredGradient.newBuilder() to construct.
+  private RegisteredGradient(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private RegisteredGradient() {
+    gradientFunc_ = "";
+    registeredOpType_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new RegisteredGradient();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private RegisteredGradient(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            gradientFunc_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            registeredOpType_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return org.tensorflow.proto.framework.FunctionProtos.internal_static_tensorflow_RegisteredGradient_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return org.tensorflow.proto.framework.FunctionProtos.internal_static_tensorflow_RegisteredGradient_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.tensorflow.proto.framework.RegisteredGradient.class, org.tensorflow.proto.framework.RegisteredGradient.Builder.class);
+  }
+
+  public static final int GRADIENT_FUNC_FIELD_NUMBER = 1;
+  private volatile java.lang.Object gradientFunc_;
+  /**
+   * <pre>
+   * The gradient function's name.
+   * </pre>
+   *
+   * <code>string gradient_func = 1;</code>
+   */
+  public java.lang.String getGradientFunc() {
+    java.lang.Object ref = gradientFunc_;
+    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();
+      gradientFunc_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The gradient function's name.
+   * </pre>
+   *
+   * <code>string gradient_func = 1;</code>
+   */
+  public com.google.protobuf.ByteString
+      getGradientFuncBytes() {
+    java.lang.Object ref = gradientFunc_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      gradientFunc_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int REGISTERED_OP_TYPE_FIELD_NUMBER = 2;
+  private volatile java.lang.Object registeredOpType_;
+  /**
+   * <pre>
+   * The gradient function's registered op type.
+   * </pre>
+   *
+   * <code>string registered_op_type = 2;</code>
+   */
+  public java.lang.String getRegisteredOpType() {
+    java.lang.Object ref = registeredOpType_;
+    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();
+      registeredOpType_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The gradient function's registered op type.
+   * </pre>
+   *
+   * <code>string registered_op_type = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getRegisteredOpTypeBytes() {
+    java.lang.Object ref = registeredOpType_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      registeredOpType_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getGradientFuncBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, gradientFunc_);
+    }
+    if (!getRegisteredOpTypeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, registeredOpType_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getGradientFuncBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, gradientFunc_);
+    }
+    if (!getRegisteredOpTypeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, registeredOpType_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof org.tensorflow.proto.framework.RegisteredGradient)) {
+      return super.equals(obj);
+    }
+    org.tensorflow.proto.framework.RegisteredGradient other = (org.tensorflow.proto.framework.RegisteredGradient) obj;
+
+    if (!getGradientFunc()
+        .equals(other.getGradientFunc())) return false;
+    if (!getRegisteredOpType()
+        .equals(other.getRegisteredOpType())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + GRADIENT_FUNC_FIELD_NUMBER;
+    hash = (53 * hash) + getGradientFunc().hashCode();
+    hash = (37 * hash) + REGISTERED_OP_TYPE_FIELD_NUMBER;
+    hash = (53 * hash) + getRegisteredOpType().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tensorflow.proto.framework.RegisteredGradient parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.tensorflow.proto.framework.RegisteredGradient prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * RegisteredGradient stores a gradient function that is registered in the
+   * gradients library and used in the ops of a function in the function library.
+   * Unlike GradientDef, these gradients are identified by op type, and not
+   * directly linked to any function.
+   * </pre>
+   *
+   * Protobuf type {@code tensorflow.RegisteredGradient}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:tensorflow.RegisteredGradient)
+      org.tensorflow.proto.framework.RegisteredGradientOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.tensorflow.proto.framework.FunctionProtos.internal_static_tensorflow_RegisteredGradient_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.tensorflow.proto.framework.FunctionProtos.internal_static_tensorflow_RegisteredGradient_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.tensorflow.proto.framework.RegisteredGradient.class, org.tensorflow.proto.framework.RegisteredGradient.Builder.class);
+    }
+
+    // Construct using org.tensorflow.proto.framework.RegisteredGradient.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      gradientFunc_ = "";
+
+      registeredOpType_ = "";
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return org.tensorflow.proto.framework.FunctionProtos.internal_static_tensorflow_RegisteredGradient_descriptor;
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.RegisteredGradient getDefaultInstanceForType() {
+      return org.tensorflow.proto.framework.RegisteredGradient.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.RegisteredGradient build() {
+      org.tensorflow.proto.framework.RegisteredGradient result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public org.tensorflow.proto.framework.RegisteredGradient buildPartial() {
+      org.tensorflow.proto.framework.RegisteredGradient result = new org.tensorflow.proto.framework.RegisteredGradient(this);
+      result.gradientFunc_ = gradientFunc_;
+      result.registeredOpType_ = registeredOpType_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof org.tensorflow.proto.framework.RegisteredGradient) {
+        return mergeFrom((org.tensorflow.proto.framework.RegisteredGradient)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(org.tensorflow.proto.framework.RegisteredGradient other) {
+      if (other == org.tensorflow.proto.framework.RegisteredGradient.getDefaultInstance()) return this;
+      if (!other.getGradientFunc().isEmpty()) {
+        gradientFunc_ = other.gradientFunc_;
+        onChanged();
+      }
+      if (!other.getRegisteredOpType().isEmpty()) {
+        registeredOpType_ = other.registeredOpType_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      org.tensorflow.proto.framework.RegisteredGradient parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (org.tensorflow.proto.framework.RegisteredGradient) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object gradientFunc_ = "";
+    /**
+     * <pre>
+     * The gradient function's name.
+     * </pre>
+     *
+     * <code>string gradient_func = 1;</code>
+     */
+    public java.lang.String getGradientFunc() {
+      java.lang.Object ref = gradientFunc_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        gradientFunc_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The gradient function's name.
+     * </pre>
+     *
+     * <code>string gradient_func = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getGradientFuncBytes() {
+      java.lang.Object ref = gradientFunc_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        gradientFunc_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The gradient function's name.
+     * </pre>
+     *
+     * <code>string gradient_func = 1;</code>
+     */
+    public Builder setGradientFunc(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      gradientFunc_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The gradient function's name.
+     * </pre>
+     *
+     * <code>string gradient_func = 1;</code>
+     */
+    public Builder clearGradientFunc() {
+      
+      gradientFunc_ = getDefaultInstance().getGradientFunc();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The gradient function's name.
+     * </pre>
+     *
+     * <code>string gradient_func = 1;</code>
+     */
+    public Builder setGradientFuncBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      gradientFunc_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object registeredOpType_ = "";
+    /**
+     * <pre>
+     * The gradient function's registered op type.
+     * </pre>
+     *
+     * <code>string registered_op_type = 2;</code>
+     */
+    public java.lang.String getRegisteredOpType() {
+      java.lang.Object ref = registeredOpType_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        registeredOpType_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The gradient function's registered op type.
+     * </pre>
+     *
+     * <code>string registered_op_type = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getRegisteredOpTypeBytes() {
+      java.lang.Object ref = registeredOpType_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        registeredOpType_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The gradient function's registered op type.
+     * </pre>
+     *
+     * <code>string registered_op_type = 2;</code>
+     */
+    public Builder setRegisteredOpType(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      registeredOpType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The gradient function's registered op type.
+     * </pre>
+     *
+     * <code>string registered_op_type = 2;</code>
+     */
+    public Builder clearRegisteredOpType() {
+      
+      registeredOpType_ = getDefaultInstance().getRegisteredOpType();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The gradient function's registered op type.
+     * </pre>
+     *
+     * <code>string registered_op_type = 2;</code>
+     */
+    public Builder setRegisteredOpTypeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      registeredOpType_ = value;
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:tensorflow.RegisteredGradient)
+  }
+
+  // @@protoc_insertion_point(class_scope:tensorflow.RegisteredGradient)
+  private static final org.tensorflow.proto.framework.RegisteredGradient DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.tensorflow.proto.framework.RegisteredGradient();
+  }
+
+  public static org.tensorflow.proto.framework.RegisteredGradient getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<RegisteredGradient>
+      PARSER = new com.google.protobuf.AbstractParser<RegisteredGradient>() {
+    @java.lang.Override
+    public RegisteredGradient parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new RegisteredGradient(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<RegisteredGradient> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<RegisteredGradient> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.tensorflow.proto.framework.RegisteredGradient getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RegisteredGradientOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RegisteredGradientOrBuilder.java
new file mode 100644
index 00000000000..d4b1a75ffe0
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RegisteredGradientOrBuilder.java
@@ -0,0 +1,45 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tensorflow/core/framework/function.proto
+
+package org.tensorflow.proto.framework;
+
+public interface RegisteredGradientOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:tensorflow.RegisteredGradient)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <pre>
+   * The gradient function's name.
+   * </pre>
+   *
+   * <code>string gradient_func = 1;</code>
+   */
+  java.lang.String getGradientFunc();
+  /**
+   * <pre>
+   * The gradient function's name.
+   * </pre>
+   *
+   * <code>string gradient_func = 1;</code>
+   */
+  com.google.protobuf.ByteString
+      getGradientFuncBytes();
+
+  /**
+   * <pre>
+   * The gradient function's registered op type.
+   * </pre>
+   *
+   * <code>string registered_op_type = 2;</code>
+   */
+  java.lang.String getRegisteredOpType();
+  /**
+   * <pre>
+   * The gradient function's registered op type.
+   * </pre>
+   *
+   * <code>string registered_op_type = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getRegisteredOpTypeBytes();
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RewriterConfig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RewriterConfig.java
index c914aee785c..54860b767d8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RewriterConfig.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RewriterConfig.java
@@ -2414,8 +2414,8 @@ public java.lang.String getMemoryOptimizerTargetNodeNameScope() {
   /**
    * <pre>
    * Maximum number of milliseconds to spend optimizing a single graph before
-   * timing out. If equal to 0 the system picks a default (currently 5 minutes).
-   * If less than 0 the optimizer will never time out.
+   * timing out. If less than or equal to 0 (default value) the optimizer will
+   * never time out.
    * </pre>
    *
    * <code>int64 meta_optimizer_timeout_ms = 20;</code>
@@ -5318,8 +5318,8 @@ public Builder setMemoryOptimizerTargetNodeNameScopeBytes(
     /**
      * <pre>
      * Maximum number of milliseconds to spend optimizing a single graph before
-     * timing out. If equal to 0 the system picks a default (currently 5 minutes).
-     * If less than 0 the optimizer will never time out.
+     * timing out. If less than or equal to 0 (default value) the optimizer will
+     * never time out.
      * </pre>
      *
      * <code>int64 meta_optimizer_timeout_ms = 20;</code>
@@ -5330,8 +5330,8 @@ public long getMetaOptimizerTimeoutMs() {
     /**
      * <pre>
      * Maximum number of milliseconds to spend optimizing a single graph before
-     * timing out. If equal to 0 the system picks a default (currently 5 minutes).
-     * If less than 0 the optimizer will never time out.
+     * timing out. If less than or equal to 0 (default value) the optimizer will
+     * never time out.
      * </pre>
      *
      * <code>int64 meta_optimizer_timeout_ms = 20;</code>
@@ -5345,8 +5345,8 @@ public Builder setMetaOptimizerTimeoutMs(long value) {
     /**
      * <pre>
      * Maximum number of milliseconds to spend optimizing a single graph before
-     * timing out. If equal to 0 the system picks a default (currently 5 minutes).
-     * If less than 0 the optimizer will never time out.
+     * timing out. If less than or equal to 0 (default value) the optimizer will
+     * never time out.
      * </pre>
      *
      * <code>int64 meta_optimizer_timeout_ms = 20;</code>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RewriterConfigOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RewriterConfigOrBuilder.java
index 30d25886bd3..eb2a9061177 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RewriterConfigOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/RewriterConfigOrBuilder.java
@@ -455,8 +455,8 @@ public interface RewriterConfigOrBuilder extends
   /**
    * <pre>
    * Maximum number of milliseconds to spend optimizing a single graph before
-   * timing out. If equal to 0 the system picks a default (currently 5 minutes).
-   * If less than 0 the optimizer will never time out.
+   * timing out. If less than or equal to 0 (default value) the optimizer will
+   * never time out.
    * </pre>
    *
    * <code>int64 meta_optimizer_timeout_ms = 20;</code>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedConcreteFunction.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedConcreteFunction.java
index 62106345581..12db201a9b8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedConcreteFunction.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedConcreteFunction.java
@@ -140,13 +140,6 @@ private SavedConcreteFunction(
   public static final int BOUND_INPUTS_FIELD_NUMBER = 2;
   private com.google.protobuf.Internal.IntList boundInputs_;
   /**
-   * <pre>
-   * Bound inputs to the function. The SavedObjects identified by the node ids
-   * given here are appended as extra inputs to the caller-supplied inputs.
-   * The only types of SavedObjects valid here are SavedVariable, SavedResource
-   * and SavedAsset.
-   * </pre>
-   *
    * <code>repeated int32 bound_inputs = 2;</code>
    */
   public java.util.List<java.lang.Integer>
@@ -154,26 +147,12 @@ private SavedConcreteFunction(
     return boundInputs_;
   }
   /**
-   * <pre>
-   * Bound inputs to the function. The SavedObjects identified by the node ids
-   * given here are appended as extra inputs to the caller-supplied inputs.
-   * The only types of SavedObjects valid here are SavedVariable, SavedResource
-   * and SavedAsset.
-   * </pre>
-   *
    * <code>repeated int32 bound_inputs = 2;</code>
    */
   public int getBoundInputsCount() {
     return boundInputs_.size();
   }
   /**
-   * <pre>
-   * Bound inputs to the function. The SavedObjects identified by the node ids
-   * given here are appended as extra inputs to the caller-supplied inputs.
-   * The only types of SavedObjects valid here are SavedVariable, SavedResource
-   * and SavedAsset.
-   * </pre>
-   *
    * <code>repeated int32 bound_inputs = 2;</code>
    */
   public int getBoundInputs(int index) {
@@ -661,13 +640,6 @@ private void ensureBoundInputsIsMutable() {
        }
     }
     /**
-     * <pre>
-     * Bound inputs to the function. The SavedObjects identified by the node ids
-     * given here are appended as extra inputs to the caller-supplied inputs.
-     * The only types of SavedObjects valid here are SavedVariable, SavedResource
-     * and SavedAsset.
-     * </pre>
-     *
      * <code>repeated int32 bound_inputs = 2;</code>
      */
     public java.util.List<java.lang.Integer>
@@ -676,39 +648,18 @@ private void ensureBoundInputsIsMutable() {
                java.util.Collections.unmodifiableList(boundInputs_) : boundInputs_;
     }
     /**
-     * <pre>
-     * Bound inputs to the function. The SavedObjects identified by the node ids
-     * given here are appended as extra inputs to the caller-supplied inputs.
-     * The only types of SavedObjects valid here are SavedVariable, SavedResource
-     * and SavedAsset.
-     * </pre>
-     *
      * <code>repeated int32 bound_inputs = 2;</code>
      */
     public int getBoundInputsCount() {
       return boundInputs_.size();
     }
     /**
-     * <pre>
-     * Bound inputs to the function. The SavedObjects identified by the node ids
-     * given here are appended as extra inputs to the caller-supplied inputs.
-     * The only types of SavedObjects valid here are SavedVariable, SavedResource
-     * and SavedAsset.
-     * </pre>
-     *
      * <code>repeated int32 bound_inputs = 2;</code>
      */
     public int getBoundInputs(int index) {
       return boundInputs_.getInt(index);
     }
     /**
-     * <pre>
-     * Bound inputs to the function. The SavedObjects identified by the node ids
-     * given here are appended as extra inputs to the caller-supplied inputs.
-     * The only types of SavedObjects valid here are SavedVariable, SavedResource
-     * and SavedAsset.
-     * </pre>
-     *
      * <code>repeated int32 bound_inputs = 2;</code>
      */
     public Builder setBoundInputs(
@@ -719,13 +670,6 @@ public Builder setBoundInputs(
       return this;
     }
     /**
-     * <pre>
-     * Bound inputs to the function. The SavedObjects identified by the node ids
-     * given here are appended as extra inputs to the caller-supplied inputs.
-     * The only types of SavedObjects valid here are SavedVariable, SavedResource
-     * and SavedAsset.
-     * </pre>
-     *
      * <code>repeated int32 bound_inputs = 2;</code>
      */
     public Builder addBoundInputs(int value) {
@@ -735,13 +679,6 @@ public Builder addBoundInputs(int value) {
       return this;
     }
     /**
-     * <pre>
-     * Bound inputs to the function. The SavedObjects identified by the node ids
-     * given here are appended as extra inputs to the caller-supplied inputs.
-     * The only types of SavedObjects valid here are SavedVariable, SavedResource
-     * and SavedAsset.
-     * </pre>
-     *
      * <code>repeated int32 bound_inputs = 2;</code>
      */
     public Builder addAllBoundInputs(
@@ -753,13 +690,6 @@ public Builder addAllBoundInputs(
       return this;
     }
     /**
-     * <pre>
-     * Bound inputs to the function. The SavedObjects identified by the node ids
-     * given here are appended as extra inputs to the caller-supplied inputs.
-     * The only types of SavedObjects valid here are SavedVariable, SavedResource
-     * and SavedAsset.
-     * </pre>
-     *
      * <code>repeated int32 bound_inputs = 2;</code>
      */
     public Builder clearBoundInputs() {
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedConcreteFunctionOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedConcreteFunctionOrBuilder.java
index 49145b8ca01..69a21056bac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedConcreteFunctionOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedConcreteFunctionOrBuilder.java
@@ -8,35 +8,14 @@ public interface SavedConcreteFunctionOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <pre>
-   * Bound inputs to the function. The SavedObjects identified by the node ids
-   * given here are appended as extra inputs to the caller-supplied inputs.
-   * The only types of SavedObjects valid here are SavedVariable, SavedResource
-   * and SavedAsset.
-   * </pre>
-   *
    * <code>repeated int32 bound_inputs = 2;</code>
    */
   java.util.List<java.lang.Integer> getBoundInputsList();
   /**
-   * <pre>
-   * Bound inputs to the function. The SavedObjects identified by the node ids
-   * given here are appended as extra inputs to the caller-supplied inputs.
-   * The only types of SavedObjects valid here are SavedVariable, SavedResource
-   * and SavedAsset.
-   * </pre>
-   *
    * <code>repeated int32 bound_inputs = 2;</code>
    */
   int getBoundInputsCount();
   /**
-   * <pre>
-   * Bound inputs to the function. The SavedObjects identified by the node ids
-   * given here are appended as extra inputs to the caller-supplied inputs.
-   * The only types of SavedObjects valid here are SavedVariable, SavedResource
-   * and SavedAsset.
-   * </pre>
-   *
    * <code>repeated int32 bound_inputs = 2;</code>
    */
   int getBoundInputs(int index);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObject.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObject.java
index fc2595a31ce..4f585ec9839 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObject.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObject.java
@@ -180,6 +180,20 @@ private SavedObject(
                 saveableObjects__.getKey(), saveableObjects__.getValue());
             break;
           }
+          case 98: {
+            org.tensorflow.proto.framework.CapturedTensor.Builder subBuilder = null;
+            if (kindCase_ == 12) {
+              subBuilder = ((org.tensorflow.proto.framework.CapturedTensor) kind_).toBuilder();
+            }
+            kind_ =
+                input.readMessage(org.tensorflow.proto.framework.CapturedTensor.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((org.tensorflow.proto.framework.CapturedTensor) kind_);
+              kind_ = subBuilder.buildPartial();
+            }
+            kindCase_ = 12;
+            break;
+          }
           default: {
             if (!parseUnknownField(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -241,6 +255,7 @@ public enum KindCase
     BARE_CONCRETE_FUNCTION(8),
     CONSTANT(9),
     RESOURCE(10),
+    CAPTURED_TENSOR(12),
     KIND_NOT_SET(0);
     private final int value;
     private KindCase(int value) {
@@ -263,6 +278,7 @@ public static KindCase forNumber(int value) {
         case 8: return BARE_CONCRETE_FUNCTION;
         case 9: return CONSTANT;
         case 10: return RESOURCE;
+        case 12: return CAPTURED_TENSOR;
         case 0: return KIND_NOT_SET;
         default: return null;
       }
@@ -595,6 +611,32 @@ public org.tensorflow.proto.framework.SavedResourceOrBuilder getResourceOrBuilde
     return org.tensorflow.proto.framework.SavedResource.getDefaultInstance();
   }
 
+  public static final int CAPTURED_TENSOR_FIELD_NUMBER = 12;
+  /**
+   * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+   */
+  public boolean hasCapturedTensor() {
+    return kindCase_ == 12;
+  }
+  /**
+   * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+   */
+  public org.tensorflow.proto.framework.CapturedTensor getCapturedTensor() {
+    if (kindCase_ == 12) {
+       return (org.tensorflow.proto.framework.CapturedTensor) kind_;
+    }
+    return org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance();
+  }
+  /**
+   * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+   */
+  public org.tensorflow.proto.framework.CapturedTensorOrBuilder getCapturedTensorOrBuilder() {
+    if (kindCase_ == 12) {
+       return (org.tensorflow.proto.framework.CapturedTensor) kind_;
+    }
+    return org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance();
+  }
+
   public static final int SAVEABLE_OBJECTS_FIELD_NUMBER = 11;
   private static final class SaveableObjectsDefaultEntryHolder {
     static final com.google.protobuf.MapEntry<
@@ -718,6 +760,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         internalGetSaveableObjects(),
         SaveableObjectsDefaultEntryHolder.defaultEntry,
         11);
+    if (kindCase_ == 12) {
+      output.writeMessage(12, (org.tensorflow.proto.framework.CapturedTensor) kind_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -773,6 +818,10 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(11, saveableObjects__);
     }
+    if (kindCase_ == 12) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(12, (org.tensorflow.proto.framework.CapturedTensor) kind_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -824,6 +873,10 @@ public boolean equals(final java.lang.Object obj) {
         if (!getResource()
             .equals(other.getResource())) return false;
         break;
+      case 12:
+        if (!getCapturedTensor()
+            .equals(other.getCapturedTensor())) return false;
+        break;
       case 0:
       default:
     }
@@ -879,6 +932,10 @@ public int hashCode() {
         hash = (37 * hash) + RESOURCE_FIELD_NUMBER;
         hash = (53 * hash) + getResource().hashCode();
         break;
+      case 12:
+        hash = (37 * hash) + CAPTURED_TENSOR_FIELD_NUMBER;
+        hash = (53 * hash) + getCapturedTensor().hashCode();
+        break;
       case 0:
       default:
     }
@@ -1148,6 +1205,13 @@ public org.tensorflow.proto.framework.SavedObject buildPartial() {
           result.kind_ = resourceBuilder_.build();
         }
       }
+      if (kindCase_ == 12) {
+        if (capturedTensorBuilder_ == null) {
+          result.kind_ = kind_;
+        } else {
+          result.kind_ = capturedTensorBuilder_.build();
+        }
+      }
       result.saveableObjects_ = internalGetSaveableObjects();
       result.saveableObjects_.makeImmutable();
       result.kindCase_ = kindCase_;
@@ -1282,6 +1346,10 @@ public Builder mergeFrom(org.tensorflow.proto.framework.SavedObject other) {
           mergeResource(other.getResource());
           break;
         }
+        case CAPTURED_TENSOR: {
+          mergeCapturedTensor(other.getCapturedTensor());
+          break;
+        }
         case KIND_NOT_SET: {
           break;
         }
@@ -2997,6 +3065,142 @@ public org.tensorflow.proto.framework.SavedResourceOrBuilder getResourceOrBuilde
       return resourceBuilder_;
     }
 
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.tensorflow.proto.framework.CapturedTensor, org.tensorflow.proto.framework.CapturedTensor.Builder, org.tensorflow.proto.framework.CapturedTensorOrBuilder> capturedTensorBuilder_;
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    public boolean hasCapturedTensor() {
+      return kindCase_ == 12;
+    }
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    public org.tensorflow.proto.framework.CapturedTensor getCapturedTensor() {
+      if (capturedTensorBuilder_ == null) {
+        if (kindCase_ == 12) {
+          return (org.tensorflow.proto.framework.CapturedTensor) kind_;
+        }
+        return org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance();
+      } else {
+        if (kindCase_ == 12) {
+          return capturedTensorBuilder_.getMessage();
+        }
+        return org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance();
+      }
+    }
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    public Builder setCapturedTensor(org.tensorflow.proto.framework.CapturedTensor value) {
+      if (capturedTensorBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        kind_ = value;
+        onChanged();
+      } else {
+        capturedTensorBuilder_.setMessage(value);
+      }
+      kindCase_ = 12;
+      return this;
+    }
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    public Builder setCapturedTensor(
+        org.tensorflow.proto.framework.CapturedTensor.Builder builderForValue) {
+      if (capturedTensorBuilder_ == null) {
+        kind_ = builderForValue.build();
+        onChanged();
+      } else {
+        capturedTensorBuilder_.setMessage(builderForValue.build());
+      }
+      kindCase_ = 12;
+      return this;
+    }
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    public Builder mergeCapturedTensor(org.tensorflow.proto.framework.CapturedTensor value) {
+      if (capturedTensorBuilder_ == null) {
+        if (kindCase_ == 12 &&
+            kind_ != org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance()) {
+          kind_ = org.tensorflow.proto.framework.CapturedTensor.newBuilder((org.tensorflow.proto.framework.CapturedTensor) kind_)
+              .mergeFrom(value).buildPartial();
+        } else {
+          kind_ = value;
+        }
+        onChanged();
+      } else {
+        if (kindCase_ == 12) {
+          capturedTensorBuilder_.mergeFrom(value);
+        }
+        capturedTensorBuilder_.setMessage(value);
+      }
+      kindCase_ = 12;
+      return this;
+    }
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    public Builder clearCapturedTensor() {
+      if (capturedTensorBuilder_ == null) {
+        if (kindCase_ == 12) {
+          kindCase_ = 0;
+          kind_ = null;
+          onChanged();
+        }
+      } else {
+        if (kindCase_ == 12) {
+          kindCase_ = 0;
+          kind_ = null;
+        }
+        capturedTensorBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    public org.tensorflow.proto.framework.CapturedTensor.Builder getCapturedTensorBuilder() {
+      return getCapturedTensorFieldBuilder().getBuilder();
+    }
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    public org.tensorflow.proto.framework.CapturedTensorOrBuilder getCapturedTensorOrBuilder() {
+      if ((kindCase_ == 12) && (capturedTensorBuilder_ != null)) {
+        return capturedTensorBuilder_.getMessageOrBuilder();
+      } else {
+        if (kindCase_ == 12) {
+          return (org.tensorflow.proto.framework.CapturedTensor) kind_;
+        }
+        return org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance();
+      }
+    }
+    /**
+     * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.tensorflow.proto.framework.CapturedTensor, org.tensorflow.proto.framework.CapturedTensor.Builder, org.tensorflow.proto.framework.CapturedTensorOrBuilder> 
+        getCapturedTensorFieldBuilder() {
+      if (capturedTensorBuilder_ == null) {
+        if (!(kindCase_ == 12)) {
+          kind_ = org.tensorflow.proto.framework.CapturedTensor.getDefaultInstance();
+        }
+        capturedTensorBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            org.tensorflow.proto.framework.CapturedTensor, org.tensorflow.proto.framework.CapturedTensor.Builder, org.tensorflow.proto.framework.CapturedTensorOrBuilder>(
+                (org.tensorflow.proto.framework.CapturedTensor) kind_,
+                getParentForChildren(),
+                isClean());
+        kind_ = null;
+      }
+      kindCase_ = 12;
+      onChanged();;
+      return capturedTensorBuilder_;
+    }
+
     private com.google.protobuf.MapField<
         java.lang.String, org.tensorflow.proto.framework.SaveableObject> saveableObjects_;
     private com.google.protobuf.MapField<java.lang.String, org.tensorflow.proto.framework.SaveableObject>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObjectGraphProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObjectGraphProtos.java
index 42f43aee942..d9cbd0a8f02 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObjectGraphProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObjectGraphProtos.java
@@ -49,6 +49,11 @@ public static void registerAllExtensions(
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_tensorflow_SavedFunction_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_tensorflow_CapturedTensor_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_tensorflow_CapturedTensor_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_tensorflow_SavedConcreteFunction_descriptor;
   static final 
@@ -107,7 +112,7 @@ public static void registerAllExtensions(
       "Graph.ConcreteFunctionsEntry\032[\n\026Concrete" +
       "FunctionsEntry\022\013\n\003key\030\001 \001(\t\0220\n\005value\030\002 \001" +
       "(\0132!.tensorflow.SavedConcreteFunction:\0028" +
-      "\001\"\331\005\n\013SavedObject\022R\n\010children\030\001 \003(\0132@.te" +
+      "\001\"\220\006\n\013SavedObject\022R\n\010children\030\001 \003(\0132@.te" +
       "nsorflow.TrackableObjectGraph.TrackableO" +
       "bject.ObjectReference\022^\n\016slot_variables\030" +
       "\003 \003(\0132F.tensorflow.TrackableObjectGraph." +
@@ -120,49 +125,52 @@ public static void registerAllExtensions(
       "e_function\030\010 \001(\0132%.tensorflow.SavedBareC" +
       "oncreteFunctionH\000\022-\n\010constant\030\t \001(\0132\031.te" +
       "nsorflow.SavedConstantH\000\022-\n\010resource\030\n \001" +
-      "(\0132\031.tensorflow.SavedResourceH\000\022F\n\020savea" +
-      "ble_objects\030\013 \003(\0132,.tensorflow.SavedObje" +
-      "ct.SaveableObjectsEntry\032R\n\024SaveableObjec" +
-      "tsEntry\022\013\n\003key\030\001 \001(\t\022)\n\005value\030\002 \001(\0132\032.te" +
-      "nsorflow.SaveableObject:\0028\001B\006\n\004kindJ\004\010\002\020" +
-      "\003R\nattributes\"`\n\017SavedUserObject\022\022\n\niden" +
-      "tifier\030\001 \001(\t\022\'\n\007version\030\002 \001(\0132\026.tensorfl" +
-      "ow.VersionDef\022\020\n\010metadata\030\003 \001(\t\"*\n\nSaved" +
-      "Asset\022\034\n\024asset_file_def_index\030\001 \001(\005\"\\\n\rS" +
-      "avedFunction\022\032\n\022concrete_functions\030\001 \003(\t" +
-      "\022/\n\rfunction_spec\030\002 \001(\0132\030.tensorflow.Fun" +
-      "ctionSpec\"\250\001\n\025SavedConcreteFunction\022\024\n\014b" +
-      "ound_inputs\030\002 \003(\005\022B\n\035canonicalized_input" +
-      "_signature\030\003 \001(\0132\033.tensorflow.Structured" +
-      "Value\0225\n\020output_signature\030\004 \001(\0132\033.tensor" +
-      "flow.StructuredValue\"\255\001\n\031SavedBareConcre" +
-      "teFunction\022\036\n\026concrete_function_name\030\001 \001" +
-      "(\t\022\031\n\021argument_keywords\030\002 \003(\t\022$\n\034allowed" +
-      "_positional_arguments\030\003 \001(\003\022/\n\rfunction_" +
-      "spec\030\004 \001(\0132\030.tensorflow.FunctionSpec\"\"\n\r" +
-      "SavedConstant\022\021\n\toperation\030\001 \001(\t\"\327\002\n\rSav" +
-      "edVariable\022#\n\005dtype\030\001 \001(\0162\024.tensorflow.D" +
-      "ataType\022+\n\005shape\030\002 \001(\0132\034.tensorflow.Tens" +
-      "orShapeProto\022\021\n\ttrainable\030\003 \001(\010\022<\n\017synch" +
-      "ronization\030\004 \001(\0162#.tensorflow.VariableSy" +
-      "nchronization\0224\n\013aggregation\030\005 \001(\0162\037.ten" +
-      "sorflow.VariableAggregation\022\014\n\004name\030\006 \001(" +
-      "\t\022\016\n\006device\030\007 \001(\t\022O\n,experimental_distri" +
-      "buted_variable_components\030\010 \003(\0132\031.tensor" +
-      "flow.SavedVariable\"\373\001\n\014FunctionSpec\0220\n\013f" +
-      "ullargspec\030\001 \001(\0132\033.tensorflow.Structured" +
-      "Value\022\021\n\tis_method\030\002 \001(\010\0224\n\017input_signat" +
-      "ure\030\005 \001(\0132\033.tensorflow.StructuredValue\0228" +
-      "\n\013jit_compile\030\006 \001(\0162#.tensorflow.Functio" +
-      "nSpec.JitCompile\"*\n\nJitCompile\022\013\n\007DEFAUL" +
-      "T\020\000\022\006\n\002ON\020\001\022\007\n\003OFF\020\002J\004\010\003\020\004J\004\010\004\020\005\"\037\n\rSave" +
-      "dResource\022\016\n\006device\030\001 \001(\t\"A\n\016SaveableObj" +
-      "ect\022\025\n\rsave_function\030\002 \001(\005\022\030\n\020restore_fu" +
-      "nction\030\003 \001(\005B\224\001\n\036org.tensorflow.proto.fr" +
-      "ameworkB\026SavedObjectGraphProtosP\001ZUgithu" +
-      "b.com/tensorflow/tensorflow/tensorflow/g" +
-      "o/core/protobuf/for_core_protos_go_proto" +
-      "\370\001\001b\006proto3"
+      "(\0132\031.tensorflow.SavedResourceH\000\0225\n\017captu" +
+      "red_tensor\030\014 \001(\0132\032.tensorflow.CapturedTe" +
+      "nsorH\000\022F\n\020saveable_objects\030\013 \003(\0132,.tenso" +
+      "rflow.SavedObject.SaveableObjectsEntry\032R" +
+      "\n\024SaveableObjectsEntry\022\013\n\003key\030\001 \001(\t\022)\n\005v" +
+      "alue\030\002 \001(\0132\032.tensorflow.SaveableObject:\002" +
+      "8\001B\006\n\004kindJ\004\010\002\020\003R\nattributes\"d\n\017SavedUse" +
+      "rObject\022\022\n\nidentifier\030\001 \001(\t\022\'\n\007version\030\002" +
+      " \001(\0132\026.tensorflow.VersionDef\022\024\n\010metadata" +
+      "\030\003 \001(\tB\002\030\001\"*\n\nSavedAsset\022\034\n\024asset_file_d" +
+      "ef_index\030\001 \001(\005\"\\\n\rSavedFunction\022\032\n\022concr" +
+      "ete_functions\030\001 \003(\t\022/\n\rfunction_spec\030\002 \001" +
+      "(\0132\030.tensorflow.FunctionSpec\"9\n\016Captured" +
+      "Tensor\022\014\n\004name\030\001 \001(\t\022\031\n\021concrete_functio" +
+      "n\030\002 \001(\t\"\250\001\n\025SavedConcreteFunction\022\024\n\014bou" +
+      "nd_inputs\030\002 \003(\005\022B\n\035canonicalized_input_s" +
+      "ignature\030\003 \001(\0132\033.tensorflow.StructuredVa" +
+      "lue\0225\n\020output_signature\030\004 \001(\0132\033.tensorfl" +
+      "ow.StructuredValue\"\255\001\n\031SavedBareConcrete" +
+      "Function\022\036\n\026concrete_function_name\030\001 \001(\t" +
+      "\022\031\n\021argument_keywords\030\002 \003(\t\022$\n\034allowed_p" +
+      "ositional_arguments\030\003 \001(\003\022/\n\rfunction_sp" +
+      "ec\030\004 \001(\0132\030.tensorflow.FunctionSpec\"\"\n\rSa" +
+      "vedConstant\022\021\n\toperation\030\001 \001(\t\"\327\002\n\rSaved" +
+      "Variable\022#\n\005dtype\030\001 \001(\0162\024.tensorflow.Dat" +
+      "aType\022+\n\005shape\030\002 \001(\0132\034.tensorflow.Tensor" +
+      "ShapeProto\022\021\n\ttrainable\030\003 \001(\010\022<\n\017synchro" +
+      "nization\030\004 \001(\0162#.tensorflow.VariableSync" +
+      "hronization\0224\n\013aggregation\030\005 \001(\0162\037.tenso" +
+      "rflow.VariableAggregation\022\014\n\004name\030\006 \001(\t\022" +
+      "\016\n\006device\030\007 \001(\t\022O\n,experimental_distribu" +
+      "ted_variable_components\030\010 \003(\0132\031.tensorfl" +
+      "ow.SavedVariable\"\373\001\n\014FunctionSpec\0220\n\013ful" +
+      "largspec\030\001 \001(\0132\033.tensorflow.StructuredVa" +
+      "lue\022\021\n\tis_method\030\002 \001(\010\0224\n\017input_signatur" +
+      "e\030\005 \001(\0132\033.tensorflow.StructuredValue\0228\n\013" +
+      "jit_compile\030\006 \001(\0162#.tensorflow.FunctionS" +
+      "pec.JitCompile\"*\n\nJitCompile\022\013\n\007DEFAULT\020" +
+      "\000\022\006\n\002ON\020\001\022\007\n\003OFF\020\002J\004\010\003\020\004J\004\010\004\020\005\"\037\n\rSavedR" +
+      "esource\022\016\n\006device\030\001 \001(\t\"A\n\016SaveableObjec" +
+      "t\022\025\n\rsave_function\030\002 \001(\005\022\030\n\020restore_func" +
+      "tion\030\003 \001(\005B\224\001\n\036org.tensorflow.proto.fram" +
+      "eworkB\026SavedObjectGraphProtosP\001ZUgithub." +
+      "com/tensorflow/tensorflow/tensorflow/go/" +
+      "core/protobuf/for_core_protos_go_proto\370\001" +
+      "\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -191,7 +199,7 @@ public static void registerAllExtensions(
     internal_static_tensorflow_SavedObject_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_SavedObject_descriptor,
-        new java.lang.String[] { "Children", "SlotVariables", "UserObject", "Asset", "Function", "Variable", "BareConcreteFunction", "Constant", "Resource", "SaveableObjects", "Kind", });
+        new java.lang.String[] { "Children", "SlotVariables", "UserObject", "Asset", "Function", "Variable", "BareConcreteFunction", "Constant", "Resource", "CapturedTensor", "SaveableObjects", "Kind", });
     internal_static_tensorflow_SavedObject_SaveableObjectsEntry_descriptor =
       internal_static_tensorflow_SavedObject_descriptor.getNestedTypes().get(0);
     internal_static_tensorflow_SavedObject_SaveableObjectsEntry_fieldAccessorTable = new
@@ -216,44 +224,50 @@ public static void registerAllExtensions(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_SavedFunction_descriptor,
         new java.lang.String[] { "ConcreteFunctions", "FunctionSpec", });
-    internal_static_tensorflow_SavedConcreteFunction_descriptor =
+    internal_static_tensorflow_CapturedTensor_descriptor =
       getDescriptor().getMessageTypes().get(5);
+    internal_static_tensorflow_CapturedTensor_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_tensorflow_CapturedTensor_descriptor,
+        new java.lang.String[] { "Name", "ConcreteFunction", });
+    internal_static_tensorflow_SavedConcreteFunction_descriptor =
+      getDescriptor().getMessageTypes().get(6);
     internal_static_tensorflow_SavedConcreteFunction_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_SavedConcreteFunction_descriptor,
         new java.lang.String[] { "BoundInputs", "CanonicalizedInputSignature", "OutputSignature", });
     internal_static_tensorflow_SavedBareConcreteFunction_descriptor =
-      getDescriptor().getMessageTypes().get(6);
+      getDescriptor().getMessageTypes().get(7);
     internal_static_tensorflow_SavedBareConcreteFunction_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_SavedBareConcreteFunction_descriptor,
         new java.lang.String[] { "ConcreteFunctionName", "ArgumentKeywords", "AllowedPositionalArguments", "FunctionSpec", });
     internal_static_tensorflow_SavedConstant_descriptor =
-      getDescriptor().getMessageTypes().get(7);
+      getDescriptor().getMessageTypes().get(8);
     internal_static_tensorflow_SavedConstant_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_SavedConstant_descriptor,
         new java.lang.String[] { "Operation", });
     internal_static_tensorflow_SavedVariable_descriptor =
-      getDescriptor().getMessageTypes().get(8);
+      getDescriptor().getMessageTypes().get(9);
     internal_static_tensorflow_SavedVariable_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_SavedVariable_descriptor,
         new java.lang.String[] { "Dtype", "Shape", "Trainable", "Synchronization", "Aggregation", "Name", "Device", "ExperimentalDistributedVariableComponents", });
     internal_static_tensorflow_FunctionSpec_descriptor =
-      getDescriptor().getMessageTypes().get(9);
+      getDescriptor().getMessageTypes().get(10);
     internal_static_tensorflow_FunctionSpec_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_FunctionSpec_descriptor,
         new java.lang.String[] { "Fullargspec", "IsMethod", "InputSignature", "JitCompile", });
     internal_static_tensorflow_SavedResource_descriptor =
-      getDescriptor().getMessageTypes().get(10);
+      getDescriptor().getMessageTypes().get(11);
     internal_static_tensorflow_SavedResource_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_SavedResource_descriptor,
         new java.lang.String[] { "Device", });
     internal_static_tensorflow_SaveableObject_descriptor =
-      getDescriptor().getMessageTypes().get(11);
+      getDescriptor().getMessageTypes().get(12);
     internal_static_tensorflow_SaveableObject_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tensorflow_SaveableObject_descriptor,
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObjectOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObjectOrBuilder.java
index 79283c86bce..7a7ebf1b810 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObjectOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedObjectOrBuilder.java
@@ -211,6 +211,19 @@ org.tensorflow.proto.framework.TrackableObjectGraph.TrackableObject.SlotVariable
    */
   org.tensorflow.proto.framework.SavedResourceOrBuilder getResourceOrBuilder();
 
+  /**
+   * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+   */
+  boolean hasCapturedTensor();
+  /**
+   * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+   */
+  org.tensorflow.proto.framework.CapturedTensor getCapturedTensor();
+  /**
+   * <code>.tensorflow.CapturedTensor captured_tensor = 12;</code>
+   */
+  org.tensorflow.proto.framework.CapturedTensorOrBuilder getCapturedTensorOrBuilder();
+
   /**
    * <code>map&lt;string, .tensorflow.SaveableObject&gt; saveable_objects = 11;</code>
    */
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedUserObject.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedUserObject.java
index 888f24bb867..3a9b3868396 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedUserObject.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedUserObject.java
@@ -194,15 +194,15 @@ public org.tensorflow.proto.framework.VersionDefOrBuilder getVersionOrBuilder()
   private volatile java.lang.Object metadata_;
   /**
    * <pre>
+   * Metadata for deserializing this object.
    * Deprecated! At the time of deprecation, Keras was the only user of this
    * field, and its saving and loading code will be updated shortly.
-   * Please save your application-specific metadata to separate file
-   * Initialization-related metadata.
+   * Please save your application-specific metadata to a separate file.
    * </pre>
    *
-   * <code>string metadata = 3;</code>
+   * <code>string metadata = 3 [deprecated = true];</code>
    */
-  public java.lang.String getMetadata() {
+  @java.lang.Deprecated public java.lang.String getMetadata() {
     java.lang.Object ref = metadata_;
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
@@ -216,15 +216,15 @@ public java.lang.String getMetadata() {
   }
   /**
    * <pre>
+   * Metadata for deserializing this object.
    * Deprecated! At the time of deprecation, Keras was the only user of this
    * field, and its saving and loading code will be updated shortly.
-   * Please save your application-specific metadata to separate file
-   * Initialization-related metadata.
+   * Please save your application-specific metadata to a separate file.
    * </pre>
    *
-   * <code>string metadata = 3;</code>
+   * <code>string metadata = 3 [deprecated = true];</code>
    */
-  public com.google.protobuf.ByteString
+  @java.lang.Deprecated public com.google.protobuf.ByteString
       getMetadataBytes() {
     java.lang.Object ref = metadata_;
     if (ref instanceof java.lang.String) {
@@ -840,15 +840,15 @@ public org.tensorflow.proto.framework.VersionDefOrBuilder getVersionOrBuilder()
     private java.lang.Object metadata_ = "";
     /**
      * <pre>
+     * Metadata for deserializing this object.
      * Deprecated! At the time of deprecation, Keras was the only user of this
      * field, and its saving and loading code will be updated shortly.
-     * Please save your application-specific metadata to separate file
-     * Initialization-related metadata.
+     * Please save your application-specific metadata to a separate file.
      * </pre>
      *
-     * <code>string metadata = 3;</code>
+     * <code>string metadata = 3 [deprecated = true];</code>
      */
-    public java.lang.String getMetadata() {
+    @java.lang.Deprecated public java.lang.String getMetadata() {
       java.lang.Object ref = metadata_;
       if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
@@ -862,15 +862,15 @@ public java.lang.String getMetadata() {
     }
     /**
      * <pre>
+     * Metadata for deserializing this object.
      * Deprecated! At the time of deprecation, Keras was the only user of this
      * field, and its saving and loading code will be updated shortly.
-     * Please save your application-specific metadata to separate file
-     * Initialization-related metadata.
+     * Please save your application-specific metadata to a separate file.
      * </pre>
      *
-     * <code>string metadata = 3;</code>
+     * <code>string metadata = 3 [deprecated = true];</code>
      */
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getMetadataBytes() {
       java.lang.Object ref = metadata_;
       if (ref instanceof String) {
@@ -885,15 +885,15 @@ public java.lang.String getMetadata() {
     }
     /**
      * <pre>
+     * Metadata for deserializing this object.
      * Deprecated! At the time of deprecation, Keras was the only user of this
      * field, and its saving and loading code will be updated shortly.
-     * Please save your application-specific metadata to separate file
-     * Initialization-related metadata.
+     * Please save your application-specific metadata to a separate file.
      * </pre>
      *
-     * <code>string metadata = 3;</code>
+     * <code>string metadata = 3 [deprecated = true];</code>
      */
-    public Builder setMetadata(
+    @java.lang.Deprecated public Builder setMetadata(
         java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
@@ -905,15 +905,15 @@ public Builder setMetadata(
     }
     /**
      * <pre>
+     * Metadata for deserializing this object.
      * Deprecated! At the time of deprecation, Keras was the only user of this
      * field, and its saving and loading code will be updated shortly.
-     * Please save your application-specific metadata to separate file
-     * Initialization-related metadata.
+     * Please save your application-specific metadata to a separate file.
      * </pre>
      *
-     * <code>string metadata = 3;</code>
+     * <code>string metadata = 3 [deprecated = true];</code>
      */
-    public Builder clearMetadata() {
+    @java.lang.Deprecated public Builder clearMetadata() {
       
       metadata_ = getDefaultInstance().getMetadata();
       onChanged();
@@ -921,15 +921,15 @@ public Builder clearMetadata() {
     }
     /**
      * <pre>
+     * Metadata for deserializing this object.
      * Deprecated! At the time of deprecation, Keras was the only user of this
      * field, and its saving and loading code will be updated shortly.
-     * Please save your application-specific metadata to separate file
-     * Initialization-related metadata.
+     * Please save your application-specific metadata to a separate file.
      * </pre>
      *
-     * <code>string metadata = 3;</code>
+     * <code>string metadata = 3 [deprecated = true];</code>
      */
-    public Builder setMetadataBytes(
+    @java.lang.Deprecated public Builder setMetadataBytes(
         com.google.protobuf.ByteString value) {
       if (value == null) {
     throw new NullPointerException();
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedUserObjectOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedUserObjectOrBuilder.java
index 91d00aa1861..71af4c08b68 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedUserObjectOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SavedUserObjectOrBuilder.java
@@ -52,25 +52,25 @@ public interface SavedUserObjectOrBuilder extends
 
   /**
    * <pre>
+   * Metadata for deserializing this object.
    * Deprecated! At the time of deprecation, Keras was the only user of this
    * field, and its saving and loading code will be updated shortly.
-   * Please save your application-specific metadata to separate file
-   * Initialization-related metadata.
+   * Please save your application-specific metadata to a separate file.
    * </pre>
    *
-   * <code>string metadata = 3;</code>
+   * <code>string metadata = 3 [deprecated = true];</code>
    */
-  java.lang.String getMetadata();
+  @java.lang.Deprecated java.lang.String getMetadata();
   /**
    * <pre>
+   * Metadata for deserializing this object.
    * Deprecated! At the time of deprecation, Keras was the only user of this
    * field, and its saving and loading code will be updated shortly.
-   * Please save your application-specific metadata to separate file
-   * Initialization-related metadata.
+   * Please save your application-specific metadata to a separate file.
    * </pre>
    *
-   * <code>string metadata = 3;</code>
+   * <code>string metadata = 3 [deprecated = true];</code>
    */
-  com.google.protobuf.ByteString
+  @java.lang.Deprecated com.google.protobuf.ByteString
       getMetadataBytes();
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SpecializedType.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SpecializedType.java
deleted file mode 100644
index 1237f97c862..00000000000
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/SpecializedType.java
+++ /dev/null
@@ -1,143 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: tensorflow/core/framework/types.proto
-
-package org.tensorflow.proto.framework;
-
-/**
- * <pre>
- * For identifying the underlying type of a variant. For variants, the types
- * listed here are a subset of the types in the variant type registry,
- * corresponding to commonly used variants which must occasionally be
- * special-cased.
- * </pre>
- *
- * Protobuf enum {@code tensorflow.SpecializedType}
- */
-public enum SpecializedType
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * <pre>
-   * Invalid/unknown specialized type.
-   * </pre>
-   *
-   * <code>ST_INVALID = 0;</code>
-   */
-  ST_INVALID(0),
-  /**
-   * <pre>
-   * "tensorflow::TensorList" in the variant type registry.
-   * </pre>
-   *
-   * <code>ST_TENSOR_LIST = 1;</code>
-   */
-  ST_TENSOR_LIST(1),
-  /**
-   * <pre>
-   * "tensorflow::data::Optional" in the variant type registry.
-   * </pre>
-   *
-   * <code>ST_OPTIONAL = 2;</code>
-   */
-  ST_OPTIONAL(2),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * <pre>
-   * Invalid/unknown specialized type.
-   * </pre>
-   *
-   * <code>ST_INVALID = 0;</code>
-   */
-  public static final int ST_INVALID_VALUE = 0;
-  /**
-   * <pre>
-   * "tensorflow::TensorList" in the variant type registry.
-   * </pre>
-   *
-   * <code>ST_TENSOR_LIST = 1;</code>
-   */
-  public static final int ST_TENSOR_LIST_VALUE = 1;
-  /**
-   * <pre>
-   * "tensorflow::data::Optional" in the variant type registry.
-   * </pre>
-   *
-   * <code>ST_OPTIONAL = 2;</code>
-   */
-  public static final int ST_OPTIONAL_VALUE = 2;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static SpecializedType valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static SpecializedType forNumber(int value) {
-    switch (value) {
-      case 0: return ST_INVALID;
-      case 1: return ST_TENSOR_LIST;
-      case 2: return ST_OPTIONAL;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap<SpecializedType>
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      SpecializedType> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap<SpecializedType>() {
-          public SpecializedType findValueByNumber(int number) {
-            return SpecializedType.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return org.tensorflow.proto.framework.TypesProtos.getDescriptor().getEnumTypes().get(1);
-  }
-
-  private static final SpecializedType[] VALUES = values();
-
-  public static SpecializedType valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private SpecializedType(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:tensorflow.SpecializedType)
-}
-
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/StructProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/StructProtos.java
index f2f04f9c9ed..7f3f81e4d34 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/StructProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/StructProtos.java
@@ -117,21 +117,22 @@ public static void registerAllExtensions(
       "hapeProto\022#\n\005dtype\030\003 \001(\0162\024.tensorflow.Da" +
       "taType\022(\n\007minimum\030\004 \001(\0132\027.tensorflow.Ten" +
       "sorProto\022(\n\007maximum\030\005 \001(\0132\027.tensorflow.T" +
-      "ensorProto\"\250\003\n\rTypeSpecProto\022@\n\017type_spe" +
+      "ensorProto\"\333\003\n\rTypeSpecProto\022@\n\017type_spe" +
       "c_class\030\001 \001(\0162\'.tensorflow.TypeSpecProto" +
       ".TypeSpecClass\022/\n\ntype_state\030\002 \001(\0132\033.ten" +
       "sorflow.StructuredValue\022\034\n\024type_spec_cla" +
-      "ss_name\030\003 \001(\t\"\205\002\n\rTypeSpecClass\022\013\n\007UNKNO" +
+      "ss_name\030\003 \001(\t\"\270\002\n\rTypeSpecClass\022\013\n\007UNKNO" +
       "WN\020\000\022\026\n\022SPARSE_TENSOR_SPEC\020\001\022\027\n\023INDEXED_" +
       "SLICES_SPEC\020\002\022\026\n\022RAGGED_TENSOR_SPEC\020\003\022\025\n" +
       "\021TENSOR_ARRAY_SPEC\020\004\022\025\n\021DATA_DATASET_SPE" +
       "C\020\005\022\026\n\022DATA_ITERATOR_SPEC\020\006\022\021\n\rOPTIONAL_" +
       "SPEC\020\007\022\024\n\020PER_REPLICA_SPEC\020\010\022\021\n\rVARIABLE" +
-      "_SPEC\020\t\022\026\n\022ROW_PARTITION_SPEC\020\n\"\004\010\013\020\013B\207\001" +
-      "\n\036org.tensorflow.proto.frameworkB\014Struct" +
-      "ProtosP\001ZUgithub.com/tensorflow/tensorfl" +
-      "ow/tensorflow/go/core/protobuf/for_core_" +
-      "protos_go_protob\006proto3"
+      "_SPEC\020\t\022\026\n\022ROW_PARTITION_SPEC\020\n\022\030\n\024REGIS" +
+      "TERED_TYPE_SPEC\020\014\022\027\n\023EXTENSION_TYPE_SPEC" +
+      "\020\r\"\004\010\013\020\013B\207\001\n\036org.tensorflow.proto.framew" +
+      "orkB\014StructProtosP\001ZUgithub.com/tensorfl" +
+      "ow/tensorflow/tensorflow/go/core/protobu" +
+      "f/for_core_protos_go_protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TensorProto.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TensorProto.java
index 756d17fef2a..97e7d1653f9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TensorProto.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TensorProto.java
@@ -599,7 +599,7 @@ public double getDoubleVal(int index) {
   private com.google.protobuf.Internal.IntList intVal_;
   /**
    * <pre>
-   * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+   * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
    * </pre>
    *
    * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -610,7 +610,7 @@ public double getDoubleVal(int index) {
   }
   /**
    * <pre>
-   * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+   * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
    * </pre>
    *
    * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -620,7 +620,7 @@ public int getIntValCount() {
   }
   /**
    * <pre>
-   * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+   * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
    * </pre>
    *
    * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -2531,7 +2531,7 @@ private void ensureIntValIsMutable() {
     }
     /**
      * <pre>
-     * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+     * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
      * </pre>
      *
      * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -2543,7 +2543,7 @@ private void ensureIntValIsMutable() {
     }
     /**
      * <pre>
-     * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+     * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
      * </pre>
      *
      * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -2553,7 +2553,7 @@ public int getIntValCount() {
     }
     /**
      * <pre>
-     * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+     * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
      * </pre>
      *
      * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -2563,7 +2563,7 @@ public int getIntVal(int index) {
     }
     /**
      * <pre>
-     * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+     * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
      * </pre>
      *
      * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -2577,7 +2577,7 @@ public Builder setIntVal(
     }
     /**
      * <pre>
-     * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+     * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
      * </pre>
      *
      * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -2590,7 +2590,7 @@ public Builder addIntVal(int value) {
     }
     /**
      * <pre>
-     * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+     * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
      * </pre>
      *
      * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -2605,7 +2605,7 @@ public Builder addAllIntVal(
     }
     /**
      * <pre>
-     * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+     * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
      * </pre>
      *
      * <code>repeated int32 int_val = 7 [packed = true];</code>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TensorProtoOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TensorProtoOrBuilder.java
index b5369066023..7ffbb5d3a3d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TensorProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TensorProtoOrBuilder.java
@@ -146,7 +146,7 @@ public interface TensorProtoOrBuilder extends
 
   /**
    * <pre>
-   * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+   * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
    * </pre>
    *
    * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -154,7 +154,7 @@ public interface TensorProtoOrBuilder extends
   java.util.List<java.lang.Integer> getIntValList();
   /**
    * <pre>
-   * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+   * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
    * </pre>
    *
    * <code>repeated int32 int_val = 7 [packed = true];</code>
@@ -162,7 +162,7 @@ public interface TensorProtoOrBuilder extends
   int getIntValCount();
   /**
    * <pre>
-   * DT_INT32, DT_INT16, DT_INT8, DT_UINT8.
+   * DT_INT32, DT_INT16, DT_UINT16, DT_INT8, DT_UINT8.
    * </pre>
    *
    * <code>repeated int32 int_val = 7 [packed = true];</code>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypeSpecProto.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypeSpecProto.java
index 10c64eeb41c..5701328f21f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypeSpecProto.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypeSpecProto.java
@@ -200,6 +200,22 @@ public enum TypeSpecClass
      * <code>ROW_PARTITION_SPEC = 10;</code>
      */
     ROW_PARTITION_SPEC(10),
+    /**
+     * <pre>
+     * The type registered as type_spec_class_name.
+     * </pre>
+     *
+     * <code>REGISTERED_TYPE_SPEC = 12;</code>
+     */
+    REGISTERED_TYPE_SPEC(12),
+    /**
+     * <pre>
+     * Subclasses of tf.ExtensionType
+     * </pre>
+     *
+     * <code>EXTENSION_TYPE_SPEC = 13;</code>
+     */
+    EXTENSION_TYPE_SPEC(13),
     UNRECOGNIZED(-1),
     ;
 
@@ -287,6 +303,22 @@ public enum TypeSpecClass
      * <code>ROW_PARTITION_SPEC = 10;</code>
      */
     public static final int ROW_PARTITION_SPEC_VALUE = 10;
+    /**
+     * <pre>
+     * The type registered as type_spec_class_name.
+     * </pre>
+     *
+     * <code>REGISTERED_TYPE_SPEC = 12;</code>
+     */
+    public static final int REGISTERED_TYPE_SPEC_VALUE = 12;
+    /**
+     * <pre>
+     * Subclasses of tf.ExtensionType
+     * </pre>
+     *
+     * <code>EXTENSION_TYPE_SPEC = 13;</code>
+     */
+    public static final int EXTENSION_TYPE_SPEC_VALUE = 13;
 
 
     public final int getNumber() {
@@ -318,6 +350,8 @@ public static TypeSpecClass forNumber(int value) {
         case 8: return PER_REPLICA_SPEC;
         case 9: return VARIABLE_SPEC;
         case 10: return ROW_PARTITION_SPEC;
+        case 12: return REGISTERED_TYPE_SPEC;
+        case 13: return EXTENSION_TYPE_SPEC;
         default: return null;
       }
     }
@@ -424,10 +458,14 @@ public org.tensorflow.proto.framework.StructuredValueOrBuilder getTypeStateOrBui
   private volatile java.lang.Object typeSpecClassName_;
   /**
    * <pre>
-   * This is currently redundant with the type_spec_class enum, and is only
-   * used for error reporting.  In particular, if you use an older binary to
-   * load a newer model, and the model uses a TypeSpecClass that the older
-   * binary doesn't support, then this lets us display a useful error message.
+   * The name of the TypeSpec class.
+   *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+   *    the one registered under this name. For types registered outside
+   *    core TensorFlow by an add-on library, that library must be loaded
+   *    before this value can be deserialized by StructureCoder.
+   *  * If type_spec_class specifies a particular TypeSpec class, this field is
+   *    redundant with the type_spec_class enum, and is only used for error
+   *    reporting in older binaries that do not know the tupe_spec_class enum.
    * </pre>
    *
    * <code>string type_spec_class_name = 3;</code>
@@ -446,10 +484,14 @@ public java.lang.String getTypeSpecClassName() {
   }
   /**
    * <pre>
-   * This is currently redundant with the type_spec_class enum, and is only
-   * used for error reporting.  In particular, if you use an older binary to
-   * load a newer model, and the model uses a TypeSpecClass that the older
-   * binary doesn't support, then this lets us display a useful error message.
+   * The name of the TypeSpec class.
+   *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+   *    the one registered under this name. For types registered outside
+   *    core TensorFlow by an add-on library, that library must be loaded
+   *    before this value can be deserialized by StructureCoder.
+   *  * If type_spec_class specifies a particular TypeSpec class, this field is
+   *    redundant with the type_spec_class enum, and is only used for error
+   *    reporting in older binaries that do not know the tupe_spec_class enum.
    * </pre>
    *
    * <code>string type_spec_class_name = 3;</code>
@@ -1021,10 +1063,14 @@ public org.tensorflow.proto.framework.StructuredValueOrBuilder getTypeStateOrBui
     private java.lang.Object typeSpecClassName_ = "";
     /**
      * <pre>
-     * This is currently redundant with the type_spec_class enum, and is only
-     * used for error reporting.  In particular, if you use an older binary to
-     * load a newer model, and the model uses a TypeSpecClass that the older
-     * binary doesn't support, then this lets us display a useful error message.
+     * The name of the TypeSpec class.
+     *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+     *    the one registered under this name. For types registered outside
+     *    core TensorFlow by an add-on library, that library must be loaded
+     *    before this value can be deserialized by StructureCoder.
+     *  * If type_spec_class specifies a particular TypeSpec class, this field is
+     *    redundant with the type_spec_class enum, and is only used for error
+     *    reporting in older binaries that do not know the tupe_spec_class enum.
      * </pre>
      *
      * <code>string type_spec_class_name = 3;</code>
@@ -1043,10 +1089,14 @@ public java.lang.String getTypeSpecClassName() {
     }
     /**
      * <pre>
-     * This is currently redundant with the type_spec_class enum, and is only
-     * used for error reporting.  In particular, if you use an older binary to
-     * load a newer model, and the model uses a TypeSpecClass that the older
-     * binary doesn't support, then this lets us display a useful error message.
+     * The name of the TypeSpec class.
+     *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+     *    the one registered under this name. For types registered outside
+     *    core TensorFlow by an add-on library, that library must be loaded
+     *    before this value can be deserialized by StructureCoder.
+     *  * If type_spec_class specifies a particular TypeSpec class, this field is
+     *    redundant with the type_spec_class enum, and is only used for error
+     *    reporting in older binaries that do not know the tupe_spec_class enum.
      * </pre>
      *
      * <code>string type_spec_class_name = 3;</code>
@@ -1066,10 +1116,14 @@ public java.lang.String getTypeSpecClassName() {
     }
     /**
      * <pre>
-     * This is currently redundant with the type_spec_class enum, and is only
-     * used for error reporting.  In particular, if you use an older binary to
-     * load a newer model, and the model uses a TypeSpecClass that the older
-     * binary doesn't support, then this lets us display a useful error message.
+     * The name of the TypeSpec class.
+     *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+     *    the one registered under this name. For types registered outside
+     *    core TensorFlow by an add-on library, that library must be loaded
+     *    before this value can be deserialized by StructureCoder.
+     *  * If type_spec_class specifies a particular TypeSpec class, this field is
+     *    redundant with the type_spec_class enum, and is only used for error
+     *    reporting in older binaries that do not know the tupe_spec_class enum.
      * </pre>
      *
      * <code>string type_spec_class_name = 3;</code>
@@ -1086,10 +1140,14 @@ public Builder setTypeSpecClassName(
     }
     /**
      * <pre>
-     * This is currently redundant with the type_spec_class enum, and is only
-     * used for error reporting.  In particular, if you use an older binary to
-     * load a newer model, and the model uses a TypeSpecClass that the older
-     * binary doesn't support, then this lets us display a useful error message.
+     * The name of the TypeSpec class.
+     *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+     *    the one registered under this name. For types registered outside
+     *    core TensorFlow by an add-on library, that library must be loaded
+     *    before this value can be deserialized by StructureCoder.
+     *  * If type_spec_class specifies a particular TypeSpec class, this field is
+     *    redundant with the type_spec_class enum, and is only used for error
+     *    reporting in older binaries that do not know the tupe_spec_class enum.
      * </pre>
      *
      * <code>string type_spec_class_name = 3;</code>
@@ -1102,10 +1160,14 @@ public Builder clearTypeSpecClassName() {
     }
     /**
      * <pre>
-     * This is currently redundant with the type_spec_class enum, and is only
-     * used for error reporting.  In particular, if you use an older binary to
-     * load a newer model, and the model uses a TypeSpecClass that the older
-     * binary doesn't support, then this lets us display a useful error message.
+     * The name of the TypeSpec class.
+     *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+     *    the one registered under this name. For types registered outside
+     *    core TensorFlow by an add-on library, that library must be loaded
+     *    before this value can be deserialized by StructureCoder.
+     *  * If type_spec_class specifies a particular TypeSpec class, this field is
+     *    redundant with the type_spec_class enum, and is only used for error
+     *    reporting in older binaries that do not know the tupe_spec_class enum.
      * </pre>
      *
      * <code>string type_spec_class_name = 3;</code>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypeSpecProtoOrBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypeSpecProtoOrBuilder.java
index db9ce3b7ab8..758545623cd 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypeSpecProtoOrBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypeSpecProtoOrBuilder.java
@@ -43,10 +43,14 @@ public interface TypeSpecProtoOrBuilder extends
 
   /**
    * <pre>
-   * This is currently redundant with the type_spec_class enum, and is only
-   * used for error reporting.  In particular, if you use an older binary to
-   * load a newer model, and the model uses a TypeSpecClass that the older
-   * binary doesn't support, then this lets us display a useful error message.
+   * The name of the TypeSpec class.
+   *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+   *    the one registered under this name. For types registered outside
+   *    core TensorFlow by an add-on library, that library must be loaded
+   *    before this value can be deserialized by StructureCoder.
+   *  * If type_spec_class specifies a particular TypeSpec class, this field is
+   *    redundant with the type_spec_class enum, and is only used for error
+   *    reporting in older binaries that do not know the tupe_spec_class enum.
    * </pre>
    *
    * <code>string type_spec_class_name = 3;</code>
@@ -54,10 +58,14 @@ public interface TypeSpecProtoOrBuilder extends
   java.lang.String getTypeSpecClassName();
   /**
    * <pre>
-   * This is currently redundant with the type_spec_class enum, and is only
-   * used for error reporting.  In particular, if you use an older binary to
-   * load a newer model, and the model uses a TypeSpecClass that the older
-   * binary doesn't support, then this lets us display a useful error message.
+   * The name of the TypeSpec class.
+   *  * If type_spec_class == REGISTERED_TYPE_SPEC, the TypeSpec class is
+   *    the one registered under this name. For types registered outside
+   *    core TensorFlow by an add-on library, that library must be loaded
+   *    before this value can be deserialized by StructureCoder.
+   *  * If type_spec_class specifies a particular TypeSpec class, this field is
+   *    redundant with the type_spec_class enum, and is only used for error
+   *    reporting in older binaries that do not know the tupe_spec_class enum.
    * </pre>
    *
    * <code>string type_spec_class_name = 3;</code>
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypesProtos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypesProtos.java
index 869330204e7..9c343efcb7c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypesProtos.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/proto/framework/TypesProtos.java
@@ -44,12 +44,11 @@ public static void registerAllExtensions(
       "_REF\020t\022\021\n\rDT_UINT16_REF\020u\022\025\n\021DT_COMPLEX1" +
       "28_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{*F\n\017SpecializedT" +
-      "ype\022\016\n\nST_INVALID\020\000\022\022\n\016ST_TENSOR_LIST\020\001\022" +
-      "\017\n\013ST_OPTIONAL\020\002B\200\001\n\036org.tensorflow.prot" +
-      "o.frameworkB\013TypesProtosP\001ZLgithub.com/t" +
-      "ensorflow/tensorflow/tensorflow/go/core/" +
-      "framework/types_go_proto\370\001\001b\006proto3"
+      "REF\020z\022\021\n\rDT_UINT64_REF\020{B\200\001\n\036org.tensorf" +
+      "low.proto.frameworkB\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-api/src/gen/resources/ops.pb b/tensorflow-core/tensorflow-core-api/src/gen/resources/ops.pb
index cc39a35b203..ff27424bb23 100644
Binary files a/tensorflow-core/tensorflow-core-api/src/gen/resources/ops.pb and b/tensorflow-core/tensorflow-core-api/src/gen/resources/ops.pb differ
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/resources/ops.pbtxt b/tensorflow-core/tensorflow-core-api/src/gen/resources/ops.pbtxt
index 8190bcc9dc7..dc03d76f47e 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/resources/ops.pbtxt
+++ b/tensorflow-core/tensorflow-core-api/src/gen/resources/ops.pbtxt
@@ -2271,14 +2271,20 @@ op {
     type: "type"
     allowed_values {
       list {
-        type: DT_INT8
-        type: DT_INT16
+        type: DT_FLOAT
+        type: DT_DOUBLE
         type: DT_INT32
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
         type: DT_INT64
+        type: DT_BFLOAT16
+        type: DT_UINT16
+        type: DT_HALF
+        type: DT_UINT32
+        type: DT_UINT64
         type: DT_COMPLEX64
         type: DT_COMPLEX128
-        type: DT_FLOAT
-        type: DT_DOUBLE
         type: DT_BOOL
         type: DT_VARIANT
       }
@@ -3756,6 +3762,90 @@ op {
     }
   }
 }
+op {
+  name: "BatchMatMulV3"
+  input_arg {
+    name: "x"
+    type_attr: "Ta"
+  }
+  input_arg {
+    name: "y"
+    type_attr: "Tb"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "Tout"
+  }
+  attr {
+    name: "Ta"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_BFLOAT16
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_UINT8
+        type: DT_INT8
+        type: DT_INT16
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+      }
+    }
+  }
+  attr {
+    name: "Tb"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_BFLOAT16
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_UINT8
+        type: DT_INT8
+        type: DT_INT16
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+      }
+    }
+  }
+  attr {
+    name: "Tout"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_BFLOAT16
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT16
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+      }
+    }
+  }
+  attr {
+    name: "adj_x"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "adj_y"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+}
 op {
   name: "BatchMatrixBandPart"
   input_arg {
@@ -6870,6 +6960,13 @@ op {
       b: false
     }
   }
+  attr {
+    name: "blank_index"
+    type: "int"
+    default_value {
+      i: -1
+    }
+  }
   attr {
     name: "T"
     type: "type"
@@ -7442,6 +7539,7 @@ op {
     }
   }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "CollectiveBcastRecvV2"
@@ -7507,6 +7605,7 @@ op {
     }
   }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "CollectiveBcastSend"
@@ -7563,6 +7662,7 @@ op {
     }
   }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "CollectiveBcastSendV2"
@@ -7615,6 +7715,7 @@ op {
     }
   }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "CollectiveGather"
@@ -7670,6 +7771,7 @@ op {
     }
   }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "CollectiveGatherV2"
@@ -7734,6 +7836,7 @@ op {
     has_minimum: true
   }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "CollectivePermute"
@@ -7790,6 +7893,7 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_BFLOAT16
         type: DT_FLOAT
         type: DT_HALF
         type: DT_DOUBLE
@@ -7859,6 +7963,7 @@ op {
     }
   }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "CollectiveReduceV2"
@@ -7892,6 +7997,7 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_BFLOAT16
         type: DT_FLOAT
         type: DT_HALF
         type: DT_DOUBLE
@@ -7944,7 +8050,15 @@ op {
     }
     has_minimum: true
   }
+  attr {
+    name: "max_subdivs_per_device"
+    type: "int"
+    default_value {
+      i: -1
+    }
+  }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "CombinedNonMaxSuppression"
@@ -8003,37 +8117,6 @@ op {
     }
   }
 }
-op {
-  name: "CompareAndBitpack"
-  input_arg {
-    name: "input"
-    type_attr: "T"
-  }
-  input_arg {
-    name: "threshold"
-    type_attr: "T"
-  }
-  output_arg {
-    name: "output"
-    type: DT_UINT8
-  }
-  attr {
-    name: "T"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_BOOL
-        type: DT_HALF
-        type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT8
-        type: DT_INT16
-        type: DT_INT32
-        type: DT_INT64
-      }
-    }
-  }
-}
 op {
   name: "Complex"
   input_arg {
@@ -8112,6 +8195,46 @@ op {
     }
   }
 }
+op {
+  name: "CompositeTensorVariantFromComponents"
+  input_arg {
+    name: "components"
+    type_list_attr: "Tcomponents"
+  }
+  output_arg {
+    name: "encoded"
+    type: DT_VARIANT
+  }
+  attr {
+    name: "metadata"
+    type: "string"
+  }
+  attr {
+    name: "Tcomponents"
+    type: "list(type)"
+    has_minimum: true
+  }
+}
+op {
+  name: "CompositeTensorVariantToComponents"
+  input_arg {
+    name: "encoded"
+    type: DT_VARIANT
+  }
+  output_arg {
+    name: "components"
+    type_list_attr: "Tcomponents"
+  }
+  attr {
+    name: "metadata"
+    type: "string"
+  }
+  attr {
+    name: "Tcomponents"
+    type: "list(type)"
+    has_minimum: true
+  }
+}
 op {
   name: "CompressElement"
   input_arg {
@@ -11225,6 +11348,13 @@ op {
       s: ""
     }
   }
+  attr {
+    name: "target_workers"
+    type: "string"
+    default_value {
+      s: "AUTO"
+    }
+  }
   is_stateful: true
 }
 op {
@@ -11295,6 +11425,13 @@ op {
       s: ""
     }
   }
+  attr {
+    name: "target_workers"
+    type: "string"
+    default_value {
+      s: "AUTO"
+    }
+  }
   is_stateful: true
 }
 op {
@@ -12044,6 +12181,7 @@ op {
         type: DT_INT16
         type: DT_INT8
         type: DT_INT64
+        type: DT_BFLOAT16
       }
     }
   }
@@ -12162,6 +12300,7 @@ op {
         type: DT_COMPLEX64
         type: DT_COMPLEX128
         type: DT_BOOL
+        type: DT_BFLOAT16
       }
     }
   }
@@ -13322,6 +13461,13 @@ op {
     has_minimum: true
     minimum: 1
   }
+  attr {
+    name: "stop_on_empty_dataset"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
 }
 op {
   name: "Div"
@@ -13381,6 +13527,7 @@ op {
       list {
         type: DT_HALF
         type: DT_FLOAT
+        type: DT_BFLOAT16
         type: DT_DOUBLE
         type: DT_COMPLEX64
         type: DT_COMPLEX128
@@ -13756,6 +13903,13 @@ op {
   output_arg {
     name: "handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -17081,8 +17235,13 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_INT8
+        type: DT_INT16
         type: DT_INT32
         type: DT_INT64
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_UINT32
         type: DT_UINT64
         type: DT_BFLOAT16
         type: DT_HALF
@@ -19280,6 +19439,8 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_BFLOAT16
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
       }
@@ -19330,6 +19491,8 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_BFLOAT16
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
       }
@@ -25077,12 +25240,12 @@ op {
         type: DT_FLOAT
         type: DT_DOUBLE
         type: DT_INT8
-        type: DT_INT16
-        type: DT_INT32
-        type: DT_INT64
         type: DT_UINT8
+        type: DT_INT16
         type: DT_UINT16
+        type: DT_INT32
         type: DT_UINT32
+        type: DT_INT64
         type: DT_UINT64
       }
     }
@@ -25337,10 +25500,14 @@ op {
         type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
+        type: DT_INT8
         type: DT_UINT8
         type: DT_INT16
+        type: DT_UINT16
         type: DT_INT32
+        type: DT_UINT32
         type: DT_INT64
+        type: DT_UINT64
       }
     }
   }
@@ -26995,6 +27162,13 @@ op {
   output_arg {
     name: "optional"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_OPTIONAL
+      args {
+        type_id: TFT_VAR
+        s: "Toutput_types"
+      }
+    }
   }
   attr {
     name: "Toutput_types"
@@ -27824,6 +27998,13 @@ op {
     name: "handle"
     type: DT_VARIANT
   }
+  attr {
+    name: "parallel_copy"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
   attr {
     name: "output_types"
     type: "list(type)"
@@ -35897,6 +36078,7 @@ op {
         type: DT_INT16
         type: DT_INT32
         type: DT_INT64
+        type: DT_UINT32
       }
     }
   }
@@ -36462,6 +36644,7 @@ op {
     }
   }
   is_stateful: true
+  is_distributed_communication: true
 }
 op {
   name: "RecvTPUEmbeddingActivations"
@@ -41656,7 +41839,9 @@ op {
         type: DT_INT8
         type: DT_UINT16
         type: DT_INT16
+        type: DT_UINT32
         type: DT_INT32
+        type: DT_UINT64
         type: DT_INT64
         type: DT_BOOL
         type: DT_BFLOAT16
@@ -41750,7 +41935,9 @@ op {
         type: DT_UINT16
         type: DT_INT16
         type: DT_INT32
+        type: DT_UINT32
         type: DT_INT64
+        type: DT_UINT64
         type: DT_BOOL
         type: DT_BFLOAT16
         type: DT_HALF
@@ -46216,6 +46403,8 @@ op {
         type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
+        type: DT_INT8
+        type: DT_INT16
         type: DT_INT32
         type: DT_INT64
         type: DT_COMPLEX64
@@ -46629,6 +46818,44 @@ op {
     }
   }
 }
+op {
+  name: "SnapshotDatasetReader"
+  input_arg {
+    name: "shard_dir"
+    type: DT_STRING
+  }
+  input_arg {
+    name: "start_index"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_VARIANT
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "compression"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "version"
+    type: "int"
+  }
+}
 op {
   name: "SnapshotDatasetV2"
   input_arg {
@@ -46717,6 +46944,36 @@ op {
     has_minimum: true
   }
 }
+op {
+  name: "SnapshotNestedDatasetReader"
+  input_arg {
+    name: "inputs"
+    type: DT_VARIANT
+    number_attr: "N"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_VARIANT
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "N"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+}
 op {
   name: "SobolSample"
   input_arg {
@@ -49582,6 +49839,7 @@ op {
     allowed_values {
       list {
         type: DT_BFLOAT16
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
       }
@@ -49641,6 +49899,8 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_BFLOAT16
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
       }
@@ -49701,6 +49961,7 @@ op {
     allowed_values {
       list {
         type: DT_BFLOAT16
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
       }
@@ -49770,6 +50031,7 @@ op {
     allowed_values {
       list {
         type: DT_BFLOAT16
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
       }
@@ -49829,6 +50091,8 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_BFLOAT16
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
       }
@@ -49889,6 +50153,7 @@ op {
     allowed_values {
       list {
         type: DT_BFLOAT16
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
       }
@@ -49999,6 +50264,67 @@ op {
     }
   }
 }
+op {
+  name: "SparseSegmentSumGrad"
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "indices"
+    type_attr: "Tidx"
+  }
+  input_arg {
+    name: "segment_ids"
+    type_attr: "Tsegmentids"
+  }
+  input_arg {
+    name: "output_dim0"
+    type: DT_INT32
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_BFLOAT16
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "Tidx"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "Tsegmentids"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+}
 op {
   name: "SparseSegmentSumWithNumSegments"
   input_arg {
@@ -55419,6 +55745,13 @@ op {
   output_arg {
     name: "output"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55496,6 +55829,13 @@ op {
   output_arg {
     name: "output_handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55605,6 +55945,13 @@ op {
   output_arg {
     name: "output_handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55624,6 +55971,13 @@ op {
   output_arg {
     name: "output_handles"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55643,6 +55997,13 @@ op {
   output_arg {
     name: "handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55691,6 +56052,13 @@ op {
   output_arg {
     name: "output_handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55724,6 +56092,13 @@ op {
   output_arg {
     name: "output_handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55751,6 +56126,13 @@ op {
   output_arg {
     name: "output_handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55784,6 +56166,13 @@ op {
   output_arg {
     name: "output_handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -55807,6 +56196,13 @@ op {
   output_arg {
     name: "output_handle"
     type: DT_VARIANT
+    experimental_full_type {
+      type_id: TFT_ARRAY
+      args {
+        type_id: TFT_VAR
+        s: "element_dtype"
+      }
+    }
   }
   attr {
     name: "element_dtype"
@@ -56797,6 +57193,13 @@ op {
       b: true
     }
   }
+  attr {
+    name: "perturb_singular"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
   attr {
     name: "T"
     type: "type"
@@ -58262,6 +58665,35 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "Window"
+  input_arg {
+    name: "inputs"
+    type_list_attr: "Tinputs"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_VARIANT
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "Tinputs"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+}
 op {
   name: "WindowDataset"
   input_arg {
@@ -58423,6 +58855,7 @@ op {
         type: DT_HALF
         type: DT_UINT32
         type: DT_UINT64
+        type: DT_BOOL
       }
     }
   }
@@ -58468,6 +58901,7 @@ op {
     allowed_values {
       list {
         type: DT_UINT8
+        type: DT_DOUBLE
         type: DT_FLOAT
         type: DT_HALF
       }
@@ -59610,6 +60044,7 @@ op {
         type: DT_HALF
         type: DT_UINT32
         type: DT_UINT64
+        type: DT_BOOL
       }
     }
   }
@@ -59687,6 +60122,7 @@ op {
         type: DT_HALF
         type: DT_UINT32
         type: DT_UINT64
+        type: DT_BOOL
       }
     }
   }
@@ -59708,6 +60144,27 @@ op {
   summary: "Wraps the XLA ReduceWindow operator, documented at"
   description: " https://www.tensorflow.org/performance/xla/operation_semantics#reducewindow ."
 }
+op {
+  name: "XlaRemoveDynamicDimensionSize"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "dim_index"
+    type: DT_INT32
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  summary: "Inverse of XlaSetDynamicDimensionSize. Make an xla bounded"
+  description: "        dynamic dimension into a static dimension. The bound of the size of\n        dimension `dim_index` becomes the static dimension size."
+}
 op {
   name: "XlaReplicaId"
   output_arg {
@@ -60213,6 +60670,7 @@ op {
         type: DT_HALF
         type: DT_UINT32
         type: DT_UINT64
+        type: DT_BOOL
       }
     }
   }
diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/op/linalg/MatMul.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/op/linalg/MatMul.java
index a156cdfd2b4..d8beacaa32f 100644
--- a/tensorflow-framework/src/main/java/org/tensorflow/framework/op/linalg/MatMul.java
+++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/op/linalg/MatMul.java
@@ -241,7 +241,7 @@ public static <T extends TNumber> Operand<T> matmul(
         adjointB = true;
       }
       return BatchMatMul.create(
-          lscope, a, b, BatchMatMul.adjX(adjointA), BatchMatMul.adjY(adjointB));
+          lscope, a, b, a.type(), BatchMatMul.adjX(adjointA), BatchMatMul.adjY(adjointB));
     }
 
     // Neither matmul nor sparse_matmul support adjoint, so we conjugate