diff --git a/examples/my_c_compile/my_c_compile.bzl b/examples/my_c_compile/my_c_compile.bzl
index 7987f6b..9892dc6 100644
--- a/examples/my_c_compile/my_c_compile.bzl
+++ b/examples/my_c_compile/my_c_compile.bzl
@@ -20,6 +20,7 @@ load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "C_COMPILE_ACTION_NAM
 MyCCompileInfo = provider(doc = "", fields = ["object"])
 
 DISABLED_FEATURES = [
+#     "module_maps",  # copybara-comment-this-out-please
 ]
 
 def _my_c_compile_impl(ctx):
diff --git a/third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config.proto b/third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config.proto
index 9f72624..d899c33 100644
--- a/third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config.proto
+++ b/third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config.proto
@@ -16,7 +16,7 @@
 
 syntax = "proto2";
 
-option java_api_version = 2;
+// option java_api_version = 2; // copybara-comment-this-out-please
 option java_package = "com.google.devtools.build.lib.view.config.crosstool";
 
 package com.google.devtools.build.lib.view.config.crosstool;
diff --git a/tools/migration/convert_crosstool_to_starlark.go b/tools/migration/convert_crosstool_to_starlark.go
index ccbbec3..d1b2a87 100644
--- a/tools/migration/convert_crosstool_to_starlark.go
+++ b/tools/migration/convert_crosstool_to_starlark.go
@@ -21,6 +21,7 @@ import (
 	"path"
 	"strings"
 
+	// Google internal base/go package, commented out by copybara
 	"log"
 	"github.com/golang/protobuf/proto"
 	crosstoolpb "third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config_go_proto"
diff --git a/tools/migration/crosstool_to_starlark_lib.go b/tools/migration/crosstool_to_starlark_lib.go
index 965bdd8..77b7565 100644
--- a/tools/migration/crosstool_to_starlark_lib.go
+++ b/tools/migration/crosstool_to_starlark_lib.go
@@ -113,6 +113,8 @@ var actionNames = map[string]string{
 	"objc-compile":                    "ACTION_NAMES.objc_compile",
 	"objc++-compile":                  "ACTION_NAMES.objcpp_compile",
 	"clif-match":                      "ACTION_NAMES.clif_match",
+// 	"objcopy_embed_data":              "ACTION_NAMES.objcopy_embed_data", // copybara-comment-this-out-please
+// 	"ld_embed_data":                   "ACTION_NAMES.ld_embed_data",      // copybara-comment-this-out-please
 }
 
 func getLoadActionsStmt() string {
@@ -347,7 +349,7 @@ func getStringStatement(crosstool *crosstoolpb.CrosstoolRelease,
 
 	mappedValuesToIds := getMappedStringValuesToIdentifiers(identifiers, fieldValues)
 	return getAssignmentStatement(field, mappedValuesToIds, crosstool,
-		cToolchainIdentifiers, depth /* isPlainString= */, true, /* shouldFail= */ true)
+		cToolchainIdentifiers, depth /* isPlainString= */, true /* shouldFail= */, true)
 }
 
 func getFeatures(crosstool *crosstoolpb.CrosstoolRelease) (
@@ -393,7 +395,7 @@ func getFeaturesDeclaration(crosstool *crosstoolpb.CrosstoolRelease,
 				cToolchainIdentifiers,
 				depth,
 				/* isPlainString= */ false,
-			  /* shouldFail= */ false))
+				/* shouldFail= */ false))
 	}
 	return strings.Join(res, "")
 }
@@ -468,7 +470,7 @@ func getActionConfigsDeclaration(
 				cToolchainIdentifiers,
 				depth,
 				/* isPlainString= */ false,
-			  /* shouldFail= */ false))
+				/* shouldFail= */ false))
 	}
 	return strings.Join(res, "")
 }
@@ -652,7 +654,7 @@ func getArtifactNamePatterns(crosstool *crosstoolpb.CrosstoolRelease,
 			cToolchainIdentifiers,
 			depth,
 			/* isPlainString= */ false,
-		  /* shouldFail= */ true))
+			/* shouldFail= */ true))
 	return strings.Join(res, "\n")
 }
 
@@ -829,7 +831,7 @@ func getToolPaths(crosstool *crosstoolpb.CrosstoolRelease,
 			cToolchainIdentifiers,
 			depth,
 			/* isPlainString= */ false,
-		  /* shouldFail= */ true))
+			/* shouldFail= */ true))
 	return strings.Join(res, "\n")
 }
 
@@ -869,7 +871,7 @@ func getMakeVariables(crosstool *crosstoolpb.CrosstoolRelease,
 			cToolchainIdentifiers,
 			depth,
 			/* isPlainString= */ false,
-		  /* shouldFail= */ true))
+			/* shouldFail= */ true))
 	return strings.Join(res, "\n")
 }