diff --git a/BUILD.bazel b/BUILD.bazel
index 86f2622049..021a333ee9 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2,7 +2,6 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "node_modules_filegroup")
 load("//tools:defaults.bzl", "karma_web_test")
 
 exports_files([
diff --git a/WORKSPACE b/WORKSPACE
index a48369410e..bc2dcc6ca9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -35,7 +35,8 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi
 # Bazel version must be at least v0.21.0 because:
 #   - 0.21.0 Using --incompatible_strict_action_env flag fixes cache when running `yarn bazel`
 #            (see https://github.com/angular/angular/issues/27514#issuecomment-451438271)
-check_bazel_version("0.21.0", """
+check_bazel_version(
+    message = """
 You no longer need to install Bazel on your machine.
 Angular has a dependency on the @bazel/bazel package which supplies it.
 Try running `yarn bazel` instead.
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 2d77e96a3a..86c1470cac 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -23,13 +23,16 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi
 # Bazel version must be at least v0.21.0 because:
 #   - 0.21.0 Using --incompatible_strict_action_env flag fixes cache when running `yarn bazel`
 #            (see https://github.com/angular/angular/issues/27514#issuecomment-451438271)
-check_bazel_version("0.21.0", """
+check_bazel_version(
+    message = """
 You no longer need to install Bazel on your machine.
 Angular has a dependency on the @bazel/bazel package which supplies it.
 Try running `yarn bazel` instead.
     (If you did run that, check that you've got a fresh `yarn install`)
 
-""")
+""",
+    minimum_bazel_version = "0.21.0",
+)
 
 # Setup the Node.js toolchain
 node_repositories(
diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel
index 7ea70c2a09..e04abde8c5 100644
--- a/integration/bazel/src/BUILD.bazel
+++ b/integration/bazel/src/BUILD.bazel
@@ -1,12 +1,10 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@npm_angular_bazel//:index.bzl", "ng_module")
-load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "nodejs_binary", "rollup_bundle")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "rollup_bundle")
 load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
-package(default_visibility = ["//visibility:public"])
-
 # Allow targets under sub-packages to reference the tsconfig.json file
 exports_files(["tsconfig.json"])
 
diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel
index abadf03c1b..e081522371 100644
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@@ -5,8 +5,6 @@ load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
 load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
 
-package(default_visibility = ["//visibility:public"])
-
 sass_binary(
     name = "hello-world-styles",
     src = "hello-world.component.scss",
diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel
index d7b68d723d..2c87ddba91 100644
--- a/modules/benchmarks/src/largetable/iv/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/iv/BUILD.bazel
@@ -1,4 +1,3 @@
-load("//tools:defaults.bzl", "ts_library")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel
index 306be43e2b..a4ae3675cb 100644
--- a/modules/benchmarks/src/largetable/render3/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel
@@ -4,8 +4,6 @@ load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "largetable_lib",
     srcs = glob(["**/*.ts"]),
diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel
index b51b4d9656..705018b0eb 100644
--- a/modules/benchmarks/src/tree/render3/BUILD.bazel
+++ b/modules/benchmarks/src/tree/render3/BUILD.bazel
@@ -4,8 +4,6 @@ load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "tree_lib",
     srcs = glob(["**/*.ts"]),
diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel
index 22cc107de6..c4779d184d 100644
--- a/modules/playground/src/zippy_component/BUILD.bazel
+++ b/modules/playground/src/zippy_component/BUILD.bazel
@@ -6,7 +6,7 @@ package(default_visibility = ["//modules/playground:__subpackages__"])
 ng_module(
     name = "zippy_component",
     srcs = glob(["**/*.ts"]),
-    assets = glob(["app/zippy.html"]),
+    assets = ["app/zippy.html"],
     tsconfig = "//modules/playground:tsconfig-build.json",
     # TODO: FW-1004 Type checking is currently not complete.
     type_check = False,
diff --git a/package.json b/package.json
index 3f1d47db43..7d54afad2a 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "url": "https://github.com/angular/angular.git"
   },
   "scripts": {
-    "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=args-order,attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,out-of-order-load,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unsorted-dict-items,unused-variable",
+    "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=args-order,attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unused-variable",
     "bazel:lint": "yarn bazel:format --lint=warn",
     "bazel:lint-fix": "yarn bazel:format --lint=fix",
     "preinstall": "node tools/yarn/check-yarn.js",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index 8c5112d4a5..65ff743075 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -1,5 +1,3 @@
-load("//tools:defaults.bzl", "ts_library")
-
 package(default_visibility = ["//visibility:public"])
 
 exports_files([
diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel
index 04767652e0..6f806fbfec 100644
--- a/packages/bazel/src/BUILD.bazel
+++ b/packages/bazel/src/BUILD.bazel
@@ -8,6 +8,8 @@ filegroup(
 # For generating skydoc
 exports_files(glob(["*.bzl"]))
 
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
 nodejs_binary(
     name = "rollup_with_build_optimizer",
     data = [
diff --git a/packages/bazel/src/esm5.bzl b/packages/bazel/src/esm5.bzl
index e0f3fd6ba9..57d2157ca3 100644
--- a/packages/bazel/src/esm5.bzl
+++ b/packages/bazel/src/esm5.bzl
@@ -170,11 +170,6 @@ esm5_outputs_aspect = aspect(
             executable = True,
             cfg = "host",
         ),
-        "_tsc_wrapped": attr.label(
-            default = Label("@build_bazel_rules_typescript//:@bazel/typescript/tsc_wrapped"),
-            executable = True,
-            cfg = "host",
-        ),
     },
 )
 
diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
index 183a08fb75..416927ff3d 100644
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@@ -244,8 +244,6 @@ def _expected_outs(ctx):
     # TODO(alxhub): i18n is only produced by the legacy compiler currently. This should be re-enabled
     # when ngtsc can extract messages
     if is_legacy_ngc:
-        # TODO(manekinekko): due to bazelbuild/bazel#4858 we cannot fix the call to ctx.new_file(genfiles_dir)
-        # so the rule is turned off for now.
         i18n_messages_files = [ctx.new_file(ctx.genfiles_dir, ctx.label.name + "_ngc_messages.xmb")]
     else:
         i18n_messages_files = []
@@ -270,9 +268,9 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
         expected_outs = outs.closure_js
 
     angular_compiler_options = {
-        "allowEmptyCodegenFiles": True,
-        "enableIvy": _enable_ivy_value(ctx),
         "enableResourceInlining": ctx.attr.inline_resources,
+        "generateCodeForLibraries": False,
+        "allowEmptyCodegenFiles": True,
         # Summaries are only enabled if Angular outputs are to be produced.
         "enableSummariesForJit": is_legacy_ngc,
         "enableIvy": _enable_ivy_value(ctx),
@@ -539,8 +537,8 @@ def ng_module_impl(ctx, ts_compile_actions):
 
     if is_legacy_ngc:
         providers["angular"] = {
-            "metadata": outs.metadata,
             "summaries": outs.summaries,
+            "metadata": outs.metadata,
         }
         providers["ngc_messages"] = outs.i18n_messages
 
@@ -570,6 +568,13 @@ local_deps_aspects = [collect_node_modules_aspect, _collect_summaries_aspect]
 
 NG_MODULE_ATTRIBUTES = {
     "srcs": attr.label_list(allow_files = [".ts"]),
+
+    # Note: DEPS_ASPECTS is already a list, we add the cast to workaround
+    # https://github.com/bazelbuild/skydoc/issues/21
+    "deps": attr.label_list(
+        doc = "Targets that are imported by this target",
+        aspects = local_deps_aspects,
+    ),
     "assets": attr.label_list(
         doc = ".html and .css files needed by the Angular compiler",
         allow_files = [
@@ -578,6 +583,14 @@ NG_MODULE_ATTRIBUTES = {
             ".html",
         ],
     ),
+    "factories": attr.label_list(
+        allow_files = [".ts", ".html"],
+        mandatory = False,
+    ),
+    "filter_summaries": attr.bool(default = False),
+    "type_check": attr.bool(default = True),
+    "inline_resources": attr.bool(default = True),
+    "no_i18n": attr.bool(default = False),
     "compiler": attr.label(
         doc = """Sets a different ngc compiler binary to use for this library.
 
@@ -592,40 +605,16 @@ NG_MODULE_ATTRIBUTES = {
         executable = True,
         cfg = "host",
     ),
-    "factories": attr.label_list(
-        allow_files = [".ts", ".html"],
-        mandatory = False,
-    ),
-    "filter_summaries": attr.bool(default = False),
-    "inline_resources": attr.bool(default = True),
     "ng_xi18n": attr.label(
         default = Label(DEFAULT_NG_XI18N),
         executable = True,
         cfg = "host",
     ),
-    "no_i18n": attr.bool(default = False),
-    "type_check": attr.bool(default = True),
-
-    # Note: DEPS_ASPECTS is already a list, we add the cast to workaround
-    # https://github.com/bazelbuild/skydoc/issues/21
-    "deps": attr.label_list(
-        doc = "Targets that are imported by this target",
-        aspects = local_deps_aspects,
-    ),
     "_supports_workers": attr.bool(default = True),
 }
 
 NG_MODULE_RULE_ATTRS = dict(dict(COMMON_ATTRIBUTES, **NG_MODULE_ATTRIBUTES), **{
-    "entry_point": attr.string(),
-
-    # Default is %{name}_public_index
-    # The suffix points to the generated "bundle index" files that users import from
-    # The default is intended to avoid collisions with the users input files.
-    # Later packaging rules will point to these generated files as the entry point
-    # into the package.
-    # See the flatModuleOutFile documentation in
-    # https://github.com/angular/angular/blob/master/packages/compiler-cli/src/transformers/api.ts
-    "flat_module_out_file": attr.string(),
+    "tsconfig": attr.label(allow_single_file = True),
     "node_modules": attr.label(
         doc = """The npm packages which should be available during the compile.
 
diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel
index 1fa7a41652..8cfc2cfab3 100644
--- a/packages/bazel/src/ng_package/BUILD.bazel
+++ b/packages/bazel/src/ng_package/BUILD.bazel
@@ -1,3 +1,5 @@
+package(default_visibility = ["//visibility:public"])
+
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
 # BEGIN-DEV-ONLY
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index 3fff5ac467..c1b4c64492 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -16,12 +16,6 @@ specification of this format at https://goo.gl/jB3GVv
 load("@build_bazel_rules_nodejs//internal/common:collect_es6_sources.bzl", "collect_es6_sources")
 load("@build_bazel_rules_nodejs//internal/common:node_module_info.bzl", "NodeModuleInfo")
 load("@build_bazel_rules_nodejs//internal/common:sources_aspect.bzl", "sources_aspect")
-load(
-    "@build_bazel_rules_nodejs//:internal/npm_package/npm_package.bzl",
-    "NPM_PACKAGE_ATTRS",
-    "NPM_PACKAGE_OUTPUTS",
-    "create_package",
-)
 load(
     "@build_bazel_rules_nodejs//:internal/rollup/rollup_bundle.bzl",
     "ROLLUP_ATTRS",
@@ -38,7 +32,6 @@ load(
 load("//packages/bazel/src:external.bzl", "FLAT_DTS_FILE_SUFFIX")
 load("//packages/bazel/src:esm5.bzl", "esm5_outputs_aspect", "esm5_root_dir", "flatten_esm5")
 load("//packages/bazel/src/ng_package:collect-type-definitions.bzl", "collect_type_definitions")
-load("//packages/bazel/src:esm5.bzl", "esm5_outputs_aspect", "esm5_root_dir", "flatten_esm5")
 
 _DEFAULT_NG_PACKAGER = "@npm//@angular/bazel/bin:packager"
 
@@ -343,8 +336,8 @@ def _ng_package_impl(ctx):
         packager_inputs.extend([m.metadata_file])
         metadata_arg[m.module_name] = {
             "index": m.typings_file.path.replace(".d.ts", ".js"),
-            "metadata": m.metadata_file.path,
             "typings": m.typings_file.path,
+            "metadata": m.metadata_file.path,
         }
     packager_args.add(str(metadata_arg))
 
@@ -408,6 +401,7 @@ DEPS_ASPECTS = [esm5_outputs_aspect, sources_aspect]
 
 NG_PACKAGE_ATTRS = dict(NPM_PACKAGE_ATTRS, **dict(ROLLUP_ATTRS, **{
     "srcs": attr.label_list(allow_files = True),
+    "deps": attr.label_list(aspects = DEPS_ASPECTS),
     "data": attr.label_list(
         doc = "Additional, non-Angular files to be added to the package, e.g. global CSS assets.",
         allow_files = True,
@@ -418,15 +412,11 @@ NG_PACKAGE_ATTRS = dict(NPM_PACKAGE_ATTRS, **dict(ROLLUP_ATTRS, **{
     "entry_point_name": attr.string(
         doc = "Name to use when generating bundle files for the primary entry-point.",
     ),
-    "globals": attr.string_dict(default = {}),
-    "include_devmode_srcs": attr.bool(default = False),
     "ng_packager": attr.label(
         default = Label(_DEFAULT_NG_PACKAGER),
         executable = True,
         cfg = "host",
     ),
-    "readme_md": attr.label(allow_single_file = [".md"]),
-    "deps": attr.label_list(aspects = DEPS_ASPECTS),
     "_rollup": attr.label(
         default = Label("@build_bazel_rules_nodejs//internal/rollup"),
         executable = True,
@@ -489,8 +479,8 @@ def ng_package_outputs(name, entry_point, entry_point_name):
 
     basename = primary_entry_point_name(name, entry_point, entry_point_name)
     outputs = {
-        "fesm2015": "fesm2015/%s.js" % basename,
         "fesm5": "fesm5/%s.js" % basename,
+        "fesm2015": "fesm2015/%s.js" % basename,
         "umd": "%s.umd.js" % basename,
         "umd_min": "%s.umd.min.js" % basename,
     }
diff --git a/packages/bazel/src/protractor/utils/BUILD.bazel b/packages/bazel/src/protractor/utils/BUILD.bazel
index 0035bfa749..fd461d9610 100644
--- a/packages/bazel/src/protractor/utils/BUILD.bazel
+++ b/packages/bazel/src/protractor/utils/BUILD.bazel
@@ -2,8 +2,6 @@ package(default_visibility = ["//visibility:public"])
 
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 
-package(default_visibility = ["//visibility:public"])
-
 ts_library(
     name = "utils",
     srcs = ["index.ts"],
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index 9ce5738d5e..65550129bb 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -3,8 +3,6 @@ package(default_visibility = ["//visibility:public"])
 load("//tools:defaults.bzl", "npm_package", "ts_library")
 load("@npm_bazel_typescript//:defs.bzl", "ts_config")
 
-package(default_visibility = ["//visibility:public"])
-
 ts_config(
     name = "tsconfig",
     src = "tsconfig-build.json",
diff --git a/packages/compiler-cli/src/ngtsc/cycles/BUILD.bazel b/packages/compiler-cli/src/ngtsc/cycles/BUILD.bazel
index 990d00b790..f54673ed0f 100644
--- a/packages/compiler-cli/src/ngtsc/cycles/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/cycles/BUILD.bazel
@@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "cycles",
-    srcs = glob([
-        "index.ts",
+    srcs = ["index.ts"] + glob([
         "src/**/*.ts",
     ]),
     module_name = "@angular/compiler-cli/src/ngtsc/cycles",
diff --git a/packages/compiler-cli/src/ngtsc/path/BUILD.bazel b/packages/compiler-cli/src/ngtsc/path/BUILD.bazel
index f041fba829..2435fdc0e9 100644
--- a/packages/compiler-cli/src/ngtsc/path/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/path/BUILD.bazel
@@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "path",
-    srcs = glob([
-        "index.ts",
+    srcs = ["index.ts"] + glob([
         "src/*.ts",
     ]),
     deps = [
diff --git a/packages/compiler-cli/src/ngtsc/routing/BUILD.bazel b/packages/compiler-cli/src/ngtsc/routing/BUILD.bazel
index 7d96c18bd7..9670f24f81 100644
--- a/packages/compiler-cli/src/ngtsc/routing/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/routing/BUILD.bazel
@@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "routing",
-    srcs = glob([
-        "index.ts",
+    srcs = ["index.ts"] + glob([
         "src/**/*.ts",
     ]),
     module_name = "@angular/compiler-cli/src/ngtsc/routing",
diff --git a/packages/compiler-cli/src/ngtsc/scope/BUILD.bazel b/packages/compiler-cli/src/ngtsc/scope/BUILD.bazel
index b1ae56776f..655f6d8929 100644
--- a/packages/compiler-cli/src/ngtsc/scope/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/scope/BUILD.bazel
@@ -4,8 +4,7 @@ load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "scope",
-    srcs = glob([
-        "index.ts",
+    srcs = ["index.ts"] + glob([
         "src/**/*.ts",
     ]),
     deps = [
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel b/packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel
index e15812685b..b8af5238a3 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel
+++ b/packages/compiler-cli/test/ngtsc/fake_core/BUILD.bazel
@@ -1,7 +1,7 @@
-load("//tools:defaults.bzl", "ng_package", "ts_library")
-
 package(default_visibility = ["//visibility:public"])
 
+load("//tools:defaults.bzl", "ng_package", "ts_library")
+
 ts_library(
     name = "fake_core",
     srcs = [
diff --git a/packages/core/test/bundling/animation_world/BUILD.bazel b/packages/core/test/bundling/animation_world/BUILD.bazel
index 42dc72553b..f895027191 100644
--- a/packages/core/test/bundling/animation_world/BUILD.bazel
+++ b/packages/core/test/bundling/animation_world/BUILD.bazel
@@ -1,10 +1,8 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
+load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "animation_world",
     srcs = ["index.ts"],
diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
index 36cb746bb3..4a48c199b4 100644
--- a/packages/core/test/bundling/hello_world/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -4,8 +4,6 @@ load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "hello_world",
     srcs = ["index.ts"],
diff --git a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
index 489410577d..f0b7d00712 100644
--- a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
@@ -1,10 +1,8 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_library")
+load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "hello_world_i18n",
     srcs = ["index.ts"],
diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world_r2/BUILD.bazel
index 9d1d446a2d..1601c9b57b 100644
--- a/packages/core/test/bundling/hello_world_r2/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world_r2/BUILD.bazel
@@ -3,8 +3,6 @@ package(default_visibility = ["//visibility:public"])
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "hello_world",
     srcs = ["index.ts"],
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index 0d6cbbf46c..eb60ff4618 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -5,8 +5,6 @@ load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "todo",
     srcs = ["index.ts"],
diff --git a/packages/core/test/bundling/todo_i18n/BUILD.bazel b/packages/core/test/bundling/todo_i18n/BUILD.bazel
index cb61d0b738..94da2d7409 100644
--- a/packages/core/test/bundling/todo_i18n/BUILD.bazel
+++ b/packages/core/test/bundling/todo_i18n/BUILD.bazel
@@ -4,8 +4,6 @@ load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "todo_i18n",
     srcs = [
diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo_r2/BUILD.bazel
index 6ce564bc0b..3eeed75691 100644
--- a/packages/core/test/bundling/todo_r2/BUILD.bazel
+++ b/packages/core/test/bundling/todo_r2/BUILD.bazel
@@ -4,8 +4,6 @@ load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
-package(default_visibility = ["//visibility:public"])
-
 ng_module(
     name = "todo",
     srcs = ["index.ts"],
diff --git a/packages/private/testing/BUILD.bazel b/packages/private/testing/BUILD.bazel
index 9981322971..90299288c5 100644
--- a/packages/private/testing/BUILD.bazel
+++ b/packages/private/testing/BUILD.bazel
@@ -5,6 +5,8 @@ package(default_visibility = [
 
 exports_files(["package.json"])
 
+load("//tools:defaults.bzl", "ng_module")
+
 ng_module(
     name = "testing",
     testonly = True,
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index 078ef8068a..776cd8c555 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -6,7 +6,6 @@ load("@npm_bazel_karma//:defs.bzl", _karma_web_test = "karma_web_test", _karma_w
 load("@npm_bazel_typescript//:defs.bzl", _ts_library = "ts_library")
 load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle")
-load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 
 _DEFAULT_TSCONFIG_BUILD = "//packages:tsconfig-build.json"
 _DEFAULT_TSCONFIG_TEST = "//packages:tsconfig-test"
diff --git a/yarn.lock b/yarn.lock
index 5a624242a0..2f4acfb2ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -82,23 +82,23 @@
     "@bazel/bazel-linux_x64" "0.22.0"
     "@bazel/bazel-win32_x64" "0.22.0"
 
-"@bazel/buildifier-darwin_x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@bazel/buildifier-darwin_x64/-/buildifier-darwin_x64-0.20.0.tgz#1aeceb5a1a57a62eef6415377dbe95091781a7d4"
-  integrity sha512-yV7niwbdpDDPUw1vgyk1wIjPl3+YOM4o5FPgFmnFgzf48JUqrF3PK6Blg95Z8SqGOVoJAOChRC1GvopzEUzwZA==
+"@bazel/buildifier-darwin_x64@0.19.2":
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/@bazel/buildifier-darwin_x64/-/buildifier-darwin_x64-0.19.2.tgz#1182862b4a3578fb9367ab42e807131187a61702"
+  integrity sha512-f6CITRj8jFhhZFrQkIao3IgJjZAXGYwUkW/QBSeAu0HIltBerJ0FTt/Nmu9ji1QZYT2aO4RpZ8oJksG6xv1dcQ==
 
-"@bazel/buildifier-linux_x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@bazel/buildifier-linux_x64/-/buildifier-linux_x64-0.20.0.tgz#8cb6c8f999dbd8a9ee183906f202b698571d771b"
-  integrity sha512-djbBtcacgERWZoxjEm8lGmMyEaOYB3moiz0kioHTQc2F96wNLfm6Cikd4Ojrcj5VNQCMW9oy3YFTu+c5mIrCcA==
+"@bazel/buildifier-linux_x64@0.19.2":
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/@bazel/buildifier-linux_x64/-/buildifier-linux_x64-0.19.2.tgz#8b26eaf1f091cd3846a7dd7ea94008b55498401e"
+  integrity sha512-kJjzbrjuAW4yVms5mbTWSHpJF6ogDLkuq4MjVP6a03umQ7E15o9YoxbDoiN+CzAj9ZMWPWfc5/N5TouiwXkGzA==
 
-"@bazel/buildifier@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-0.20.0.tgz#24a10e485fe65dbd75ef812cf37635df1fb91d0d"
-  integrity sha512-dahQRtE1KEp+efUV23q/JtOCSbQEk5C/+H3J33g8wP5roxMUa8mfDto85eloJ+gRPW7yOybxknuRYc4KSpgT7w==
+"@bazel/buildifier@^0.19.2":
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-0.19.2.tgz#3e077de346ad98561cee703297aa8db50cfb3c76"
+  integrity sha512-MwkuoQdOdZ/VYKJvZe3qVCn3/20pLJyJpzNl3cBmaccWeUtdDKhtOm8YlLU08lxrt0VcKNcTYt4uiA62e/315A==
   optionalDependencies:
-    "@bazel/buildifier-darwin_x64" "0.20.0"
-    "@bazel/buildifier-linux_x64" "0.20.0"
+    "@bazel/buildifier-darwin_x64" "0.19.2"
+    "@bazel/buildifier-linux_x64" "0.19.2"
 
 "@bazel/ibazel@~0.9.0":
   version "0.9.0"