diff --git a/Android.bp b/Android.bp
index d12e704..34d70c3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,29 +14,6 @@
 //
 //
 
-package {
-    default_applicable_licenses: ["external_junit_license"],
-}
-
-// Added automatically by a large-scale-change
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
-    name: "external_junit_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-EPL",
-    ],
-    license_text: [
-        "LICENSE-junit.txt",
-        "NOTICE.txt",
-    ],
-}
-
 java_library_static {
     name: "junit",
     host_supported: true,
@@ -44,6 +21,11 @@
     srcs: ["src/main/java/**/*.java"],
     sdk_version: "core_current",
     static_libs: ["hamcrest"],
+
+    // Pin to Java language level 8. It is loaded by an OpenJDK 8 runtime from
+    // prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh.
+    // See b/141970724.
+    java_version: "1.8",
 }
 
 // Legacy junit-host jar until references are updated
diff --git a/METADATA b/METADATA
index 98e7e51..2a2d270 100644
--- a/METADATA
+++ b/METADATA
@@ -10,7 +10,6 @@
     value: "https://github.com/junit-team/junit4/archive/r4.12.tar.gz"
   }
   version: "r4.12"
-  license_type: RECIPROCAL
   last_upgrade_date {
     year: 2016
     month: 12
diff --git a/OWNERS b/OWNERS
index dd4649a..d4956db 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,2 @@
 paulduffin@google.com
-jgaillard@google.com
-prb@google.com
+android-libcore-team+review@google.com