diff --git a/src/main/starlark/builtins_bzl/common/cc/semantics.bzl b/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
index 62f33cc06b64a5..3c2191c86ee95a 100644
--- a/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
+++ b/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
@@ -47,9 +47,9 @@ def _get_loose_mode_in_hdrs_check_allowed_attr():
 
 def _get_def_parser():
     return attr.label(
-            default = "@bazel_tools//tools/def_parser:def_parser",
-            allow_single_file = True,
-            cfg = "exec",
+        default = "@bazel_tools//tools/def_parser:def_parser",
+        allow_single_file = True,
+        cfg = "exec",
     )
 
 semantics = struct(
diff --git a/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl b/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl
index f8580686b02d36..714bf31d1edeaf 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl
@@ -46,6 +46,7 @@ def _get_coverage_runner(ctx):
     if not runner:
         fail("jacocorunner not set in java_toolchain")
     runner_jar = runner.executable
+
     # wrap the jar in JavaInfo so we can add it to deps for java_common.compile()
     return JavaInfo(output_jar = runner_jar, compile_jar = runner_jar)
 
diff --git a/src/main/starlark/builtins_bzl/common/proto/proto_semantics.bzl b/src/main/starlark/builtins_bzl/common/proto/proto_semantics.bzl
index ea1566106a5d8b..ee0d6db6129800 100644
--- a/src/main/starlark/builtins_bzl/common/proto/proto_semantics.bzl
+++ b/src/main/starlark/builtins_bzl/common/proto/proto_semantics.bzl
@@ -17,15 +17,15 @@ Proto Semantics
 """
 
 def _preprocess(ctx):
-   pass
+    pass
 
 semantics = struct(
-   PROTO_COMPILER_LABEL = "@com_google_protobuf//:protoc",
-   EXTRA_ATTRIBUTES = {
-      "import_prefix": attr.string(),
-   },
-   EXTRA_FRAGMENTS = [],
-   preprocess = _preprocess,
+    PROTO_COMPILER_LABEL = "@com_google_protobuf//:protoc",
+    EXTRA_ATTRIBUTES = {
+        "import_prefix": attr.string(),
+    },
+    EXTRA_FRAGMENTS = [],
+    preprocess = _preprocess,
     # This constant is used in ProtoCompileActionBuilder to generate an error message that's
     # displayed when a strict proto deps violation occurs.
     #
@@ -36,4 +36,4 @@ semantics = struct(
         "--direct_dependencies_violation_msg=" +
         "%%s is imported, but %s doesn't directly depend on a proto_library that 'srcs' it."
     ),
- )
\ No newline at end of file
+)
diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index ac8ed5d8828a49..14479d46b61486 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -24,7 +24,6 @@ BASE_JDK9_JVM_OPTS = [
     "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
     "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
     "--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
-    "--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
     "--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
     "--add-exports=jdk.compiler/com.sun.tools.javac.resources=ALL-UNNAMED",
     "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
@@ -32,6 +31,7 @@ BASE_JDK9_JVM_OPTS = [
     "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
     "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
     "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+    "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
 
     # quiet warnings from com.google.protobuf.UnsafeUtil,
     # see: https://github.com/google/protobuf/issues/3781