Upgrade to AGP 8.6.0-beta01

- Update lint baselines

Test: ./gradlew bOS --dry-run
      ./studiow all -> gradle sync
Change-Id: Iac01744758903b9212ea365fb8ced7593b532a6d
diff --git a/activity/activity/lint-baseline.xml b/activity/activity/lint-baseline.xml
index 242db20..59d592a0 100644
--- a/activity/activity/lint-baseline.xml
+++ b/activity/activity/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ObsoleteSdkInt"
@@ -22,8 +22,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is never &lt; 21"
-        errorLine1="            } else if (Build.VERSION.SDK_INT == 19 &amp;&amp; ContextCompat.checkSelfPermission("
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                Build.VERSION.SDK_INT == 19 &amp;&amp;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/activity/ComponentActivity.kt"/>
     </issue>
@@ -31,8 +31,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    } else if (Build.VERSION.SDK_INT >= 21) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                if (Build.VERSION.SDK_INT >= 21) {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/activity/EdgeToEdge.kt"/>
     </issue>
@@ -40,8 +40,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    } else if (Build.VERSION.SDK_INT >= 21) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                if (Build.VERSION.SDK_INT >= 21) {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/activity/EdgeToEdge.kt"/>
     </issue>
@@ -49,8 +49,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    } else if (Build.VERSION.SDK_INT >= 21) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                if (Build.VERSION.SDK_INT >= 21) {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/activity/EdgeToEdge.kt"/>
     </issue>
diff --git a/appcompat/appcompat-lint/integration-tests/lint-baseline.xml b/appcompat/appcompat-lint/integration-tests/lint-baseline.xml
index f568c6a..abf06096 100644
--- a/appcompat/appcompat-lint/integration-tests/lint-baseline.xml
+++ b/appcompat/appcompat-lint/integration-tests/lint-baseline.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.appcompat.AppCompatLintDemo is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            noop.setCompoundDrawableTintList(csl);"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.appcompat.AppCompatLintDemo is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            noop.setCompoundDrawableTintMode(PorterDuff.Mode.DST);"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="UseAndroidAlpha"
diff --git a/appcompat/appcompat/lint-baseline.xml b/appcompat/appcompat/lint-baseline.xml
index e5dbab9..9d24e27e 100644
--- a/appcompat/appcompat/lint-baseline.xml
+++ b/appcompat/appcompat/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="NewApi"
@@ -193,7 +193,7 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="        Thread.sleep(/* millis = */ 2000)"
+        errorLine1="        Thread.sleep(/* millis= */ 2000)"
         errorLine2="               ~~~~~">
         <location
             file="src/androidTest/java/androidx/appcompat/app/LocalesConfigChangedUsingInvalidTopLocale.kt"/>
@@ -202,7 +202,7 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="        Thread.sleep(/* millis = */ 2000)"
+        errorLine1="        Thread.sleep(/* millis= */ 2000)"
         errorLine2="               ~~~~~">
         <location
             file="src/androidTest/java/androidx/appcompat/app/LocalesConfigChangedUsingInvalidTopLocale.kt"/>
diff --git a/benchmark/benchmark-common/lint-baseline.xml b/benchmark/benchmark-common/lint-baseline.xml
index 0568301..412113c 100644
--- a/benchmark/benchmark-common/lint-baseline.xml
+++ b/benchmark/benchmark-common/lint-baseline.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.benchmark.ExperimentalBenchmarkConfigApi` or `@OptIn(markerClass = androidx.benchmark.ExperimentalBenchmarkConfigApi.class)`">
-        <location
-            file="src/main/java/androidx/benchmark/MetricsContainer.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.benchmark.ExperimentalBenchmarkConfigApi` or `@OptIn(markerClass = androidx.benchmark.ExperimentalBenchmarkConfigApi.class)`">
-        <location
-            file="src/main/java/androidx/benchmark/MicrobenchmarkPhase.kt"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ObsoleteSdkInt"
@@ -36,8 +22,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="        Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    if (sampled &amp;&amp; Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/benchmark/Profiler.kt"/>
     </issue>
@@ -72,267 +58,6 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="    @RequiresApi(21)"
-        errorLine2="    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="@RequiresApi(Build.VERSION_CODES.LOLLIPOP)"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="@RequiresApi(Build.VERSION_CODES.LOLLIPOP)"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="@RequiresApi(Build.VERSION_CODES.LOLLIPOP)"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/Shell.kt"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
         errorLine1="        if (Build.VERSION.SDK_INT >= 21) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/benchmark/benchmark-darwin-gradle-plugin/lint-baseline.xml b/benchmark/benchmark-darwin-gradle-plugin/lint-baseline.xml
index dcdc3f1..9ce75c2 100644
--- a/benchmark/benchmark-darwin-gradle-plugin/lint-baseline.xml
+++ b/benchmark/benchmark-darwin-gradle-plugin/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="GradleProjectIsolation"
         message="Use providers.gradleProperty instead of findProperty"
-        errorLine1="        val xcodeGenUri = when (val uri = project.findProperty(XCODEGEN_DOWNLOAD_URI)) {"
-        errorLine2="                                                  ~~~~~~~~~~~~">
+        errorLine1="            when (val uri = project.findProperty(XCODEGEN_DOWNLOAD_URI)) {"
+        errorLine2="                                    ~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPlugin.kt"/>
     </issue>
diff --git a/benchmark/benchmark-macro/lint-baseline.xml b/benchmark/benchmark-macro/lint-baseline.xml
index ad8812d..030d1971 100644
--- a/benchmark/benchmark-macro/lint-baseline.xml
+++ b/benchmark/benchmark-macro/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha09" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha09)" variant="all" version="8.4.0-alpha09">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                    Thread.sleep(50)"
-        errorLine2="                           ~~~~~">
+        errorLine1="                        Thread.sleep(50)"
+        errorLine2="                               ~~~~~">
         <location
             file="src/androidTest/java/androidx/benchmark/macro/perfetto/AndroidxTracingTraceTest.kt"/>
     </issue>
@@ -13,8 +13,8 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                trace(label) { Thread.sleep(50) }"
-        errorLine2="                                      ~~~~~">
+        errorLine1="                    trace(label) { Thread.sleep(50) }"
+        errorLine2="                                          ~~~~~">
         <location
             file="src/androidTest/java/androidx/benchmark/macro/perfetto/AndroidxTracingTraceTest.kt"/>
     </issue>
@@ -28,46 +28,4 @@
             file="src/androidTest/java/androidx/benchmark/macro/ConfigurableActivity.kt"/>
     </issue>
 
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.benchmark.perfetto.ExperimentalPerfettoTraceProcessorApi` or `@OptIn(markerClass = androidx.benchmark.perfetto.ExperimentalPerfettoTraceProcessorApi.class)`">
-        <location
-            file="src/main/java/androidx/benchmark/macro/perfetto/MemoryCountersQuery.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.benchmark.macro.ExperimentalMetricApi` or `@OptIn(markerClass = androidx.benchmark.macro.ExperimentalMetricApi.class)`">
-        <location
-            file="src/main/java/androidx/benchmark/macro/perfetto/MemoryUsageQuery.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.benchmark.macro.ExperimentalMetricApi` or `@OptIn(markerClass = androidx.benchmark.macro.ExperimentalMetricApi.class)`">
-        <location
-            file="src/main/java/androidx/benchmark/macro/MetricResultExtensions.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.benchmark.macro.ExperimentalMetricApi` or `@OptIn(markerClass = androidx.benchmark.macro.ExperimentalMetricApi.class)`">
-        <location
-            file="src/main/java/androidx/benchmark/macro/MetricResultExtensions.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.benchmark.perfetto.ExperimentalPerfettoTraceProcessorApi` or `@OptIn(markerClass = androidx.benchmark.perfetto.ExperimentalPerfettoTraceProcessorApi.class)`">
-        <location
-            file="src/main/java/androidx/benchmark/macro/perfetto/PowerQuery.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.benchmark.perfetto.ExperimentalPerfettoTraceProcessorApi` or `@OptIn(markerClass = androidx.benchmark.perfetto.ExperimentalPerfettoTraceProcessorApi.class)`">
-        <location
-            file="src/main/java/androidx/benchmark/perfetto/Slice.kt"/>
-    </issue>
-
 </issues>
diff --git a/benchmark/gradle-plugin/lint-baseline.xml b/benchmark/gradle-plugin/lint-baseline.xml
index b42bedc..671e628 100644
--- a/benchmark/gradle-plugin/lint-baseline.xml
+++ b/benchmark/gradle-plugin/lint-baseline.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
-
-    <issue
-        id="EagerGradleConfiguration"
-        message="Avoid using method findByName"
-        errorLine1="        if (project.rootProject.tasks.findByName(&quot;lockClocks&quot;) == null) {"
-        errorLine2="                                      ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt"/>
-    </issue>
-
-    <issue
-        id="EagerGradleConfiguration"
-        message="Avoid using method findByName"
-        errorLine1="        if (project.rootProject.tasks.findByName(&quot;unlockClocks&quot;) == null) {"
-        errorLine2="                                      ~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/androidx/benchmark/gradle/BenchmarkPlugin.kt"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="GradleProjectIsolation"
diff --git a/buildSrc-tests/lint-baseline.xml b/buildSrc-tests/lint-baseline.xml
index 82aca5e..b638fec 100644
--- a/buildSrc-tests/lint-baseline.xml
+++ b/buildSrc-tests/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha06)" variant="all" version="8.5.0-alpha06">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="EagerGradleConfiguration"
@@ -67,15 +67,6 @@
     <issue
         id="EagerGradleConfiguration"
         message="Avoid using method findByName"
-        errorLine1="        if (project.tasks.findByName(&quot;check&quot;) != null) {"
-        errorLine2="                          ~~~~~~~~~~">
-        <location
-            file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/Ktlint.kt"/>
-    </issue>
-
-    <issue
-        id="EagerGradleConfiguration"
-        message="Avoid using method findByName"
         errorLine1="    tasks.findByName(taskName)"
         errorLine2="          ~~~~~~~~~~">
         <location
diff --git a/camera/camera-camera2-pipe-integration/lint-baseline.xml b/camera/camera-camera2-pipe-integration/lint-baseline.xml
index 7726617..6049b5d 100644
--- a/camera/camera-camera2-pipe-integration/lint-baseline.xml
+++ b/camera/camera-camera2-pipe-integration/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha06)" variant="all" version="8.5.0-alpha06">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="CameraXQuirksClassDetector"
@@ -49,7 +49,7 @@
     <issue
         id="SupportAnnotationUsage"
         message="Did you mean `@get:VisibleForTesting`? Without `get:` this annotates the constructor parameter itself instead of the associated getter."
-        errorLine1="    @VisibleForTesting internal val requestListener:"
+        errorLine1="    @VisibleForTesting internal val requestListener: ComboRequestListener,"
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/pipe/integration/interop/Camera2CameraControl.kt"/>
diff --git a/camera/camera-camera2/lint-baseline.xml b/camera/camera-camera2/lint-baseline.xml
index 815bea7..8e783a1 100644
--- a/camera/camera-camera2/lint-baseline.xml
+++ b/camera/camera-camera2/lint-baseline.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha06)" variant="all" version="8.5.0-alpha06">
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 30 (current min is 21): `android.hardware.camera2.CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE`"
-        errorLine1="                    CameraCharacteristics.CONTROL_ZOOM_RATIO_RANGE).getUpper();"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/camera/camera2/internal/ZoomControlDeviceTest.java"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
diff --git a/camera/integration-tests/avsynctestapp/lint-baseline.xml b/camera/integration-tests/avsynctestapp/lint-baseline.xml
index 3544f4b..0dd664f0 100644
--- a/camera/integration-tests/avsynctestapp/lint-baseline.xml
+++ b/camera/integration-tests/avsynctestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="RestrictedApiAndroidX"
@@ -23,7 +23,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not start audio generation, since AudioGenerator is disabled.&quot;)"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
     </issue>
@@ -50,7 +50,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;start audio generation&quot;)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
     </issue>
@@ -77,7 +77,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not stop audio generation, since AudioGenerator is disabled.&quot;)"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
     </issue>
@@ -104,7 +104,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;stop audio generation&quot;)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
     </issue>
@@ -185,7 +185,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not initial audio track, since AudioGenerator is disabled.&quot;)"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
     </issue>
@@ -310,8 +310,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="FileUtil.generateVideoFileOutputOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                    generateVideoFileOutputOptions(fileName)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                recorder.prepareRecording(context, generateVideoFileOutputOptions(fileName))"
+        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/CameraHelper.kt"/>
     </issue>
@@ -319,8 +319,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="FileUtil.generateVideoFileOutputOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                    generateVideoFileOutputOptions(fileName)"
-        errorLine2="                                                   ~~~~~~~~">
+        errorLine1="                recorder.prepareRecording(context, generateVideoFileOutputOptions(fileName))"
+        errorLine2="                                                                                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/CameraHelper.kt"/>
     </issue>
@@ -347,7 +347,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Start signal generation.&quot;)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
     </issue>
@@ -374,7 +374,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Stop signal generation.&quot;)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
     </issue>
@@ -401,7 +401,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Start recording.&quot;)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~">
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
     </issue>
@@ -428,7 +428,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Stop recording.&quot;)"
-        errorLine2="                       ~~~~~~~~~~~~~~~">
+        errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
     </issue>
@@ -455,7 +455,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Pause recording.&quot;)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~">
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
     </issue>
@@ -482,7 +482,7 @@
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Resume recording.&quot;)"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~">
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
     </issue>
@@ -508,8 +508,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable res with type List&lt;Double>: replace with FloatList"
-        errorLine1="        val res = mutableListOf&lt;Double>()"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            val res = mutableListOf&lt;Double>()"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
     </issue>
@@ -517,8 +517,8 @@
     <issue
         id="PrimitiveInCollection"
         message="method toSamples has parameter data with type List&lt;Double>: replace with FloatList"
-        errorLine1="        data: List&lt;Double>,"
-        errorLine2="              ~~~~~~~~~~~~">
+        errorLine1="    suspend fun toSamples(data: List&lt;Double>, sampleWidth: Int): List&lt;Byte> ="
+        errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
     </issue>
diff --git a/camera/integration-tests/camerapipetestapp/lint-baseline.xml b/camera/integration-tests/camerapipetestapp/lint-baseline.xml
index 88e59e8..6331700 100644
--- a/camera/integration-tests/camerapipetestapp/lint-baseline.xml
+++ b/camera/integration-tests/camerapipetestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -11,15 +11,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.camera.integration.camera2.pipe.CameraPipeApplication is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val elapsedRealtime = Process.getStartElapsedRealtime()"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeApplication.kt"/>
-    </issue>
-
-    <issue
         id="PermissionImpliesUnsupportedChromeOsHardware"
         message="Permission exists without corresponding hardware `&lt;uses-feature android:name=&quot;android.hardware.camera&quot; required=&quot;false&quot;>` tag"
         errorLine1="    &lt;uses-permission android:name=&quot;android.permission.CAMERA&quot; />"
diff --git a/camera/integration-tests/extensionstestapp/lint-baseline.xml b/camera/integration-tests/extensionstestapp/lint-baseline.xml
index 1f2a8e8..5899a3e 100644
--- a/camera/integration-tests/extensionstestapp/lint-baseline.xml
+++ b/camera/integration-tests/extensionstestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="RestrictedApiAndroidX"
@@ -76,8 +76,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                CameraXExecutors.mainThreadExecutor()"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
+        errorLine1="            Futures.addCallback(future, evFutureCallback, CameraXExecutors.mainThreadExecutor())"
+        errorLine2="                                                                           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/extensions/validation/ImageCaptureActivity.kt"/>
     </issue>
@@ -85,8 +85,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                CameraXExecutors.mainThreadExecutor()"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
+        errorLine1="            Futures.addCallback(future, evFutureCallback, CameraXExecutors.mainThreadExecutor())"
+        errorLine2="                                                                           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/extensions/validation/ImageCaptureActivity.kt"/>
     </issue>
diff --git a/camera/integration-tests/timingtestapp/lint-baseline.xml b/camera/integration-tests/timingtestapp/lint-baseline.xml
index c36a0d1..89ad9d4 100644
--- a/camera/integration-tests/timingtestapp/lint-baseline.xml
+++ b/camera/integration-tests/timingtestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -110,28 +110,10 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.camera.integration.antelope.CameraUtilsKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    physicalCameras = cameraChars.physicalCameraIds"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/antelope/CameraUtils.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.camera.integration.antelope.cameracontrollers.CameraXControllerKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        released = texture.isReleased"
-        errorLine2="                           ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt"/>
-    </issue>
-
-    <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                    surface, CameraXExecutors.directExecutor(),"
-        errorLine2="                                              ~~~~~~~~~~~~~~">
+        errorLine1="                    CameraXExecutors.directExecutor(),"
+        errorLine2="                                     ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt"/>
     </issue>
@@ -139,8 +121,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                CameraXExecutors.mainThreadExecutor(),"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
+        errorLine1="            CameraXExecutors.mainThreadExecutor(),"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt"/>
     </issue>
diff --git a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
index 29700ac..0a24108 100644
--- a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
+++ b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="RestrictedApiAndroidX"
@@ -40,8 +40,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="UseCase.getAttachedSurfaceResolution can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        val resolution = mImageCapture.attachedSurfaceResolution"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            mImageCapture.attachedSurfaceResolution"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/uiwidgets/rotations/CameraActivity.kt"/>
     </issue>
@@ -49,8 +49,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="UseCase.getAttachedSurfaceResolution can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        val resolution = mImageCapture.attachedSurfaceResolution"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            mImageCapture.attachedSurfaceResolution"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/uiwidgets/rotations/CameraActivity.kt"/>
     </issue>
@@ -229,7 +229,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field VALID_FLASH_MODES with type List&lt;Integer>: replace with IntList"
-        errorLine1="        private val VALID_FLASH_MODES = listOf("
+        errorLine1="        private val VALID_FLASH_MODES ="
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/camera/integration/uiwidgets/compose/ui/screen/imagecapture/ImageCaptureScreenState.kt"/>
diff --git a/camera/integration-tests/viewfindertestapp/lint-baseline.xml b/camera/integration-tests/viewfindertestapp/lint-baseline.xml
index 15b245a..820ca23 100644
--- a/camera/integration-tests/viewfindertestapp/lint-baseline.xml
+++ b/camera/integration-tests/viewfindertestapp/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="RestrictedApiAndroidX"
         message="CompareSizesByArea can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                    /* comp = */ CompareSizesByArea()"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        /* comp = */ CompareSizesByArea()"
+        errorLine2="                                     ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/viewfinder/CameraViewfinderFoldableFragment.kt"/>
     </issue>
diff --git a/camera/integration-tests/viewtestapp/lint-baseline.xml b/camera/integration-tests/viewtestapp/lint-baseline.xml
index c6b452f..b090811 100644
--- a/camera/integration-tests/viewtestapp/lint-baseline.xml
+++ b/camera/integration-tests/viewtestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="RestrictedApiAndroidX"
@@ -148,8 +148,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            directExecutor(),"
-        errorLine2="            ~~~~~~~~~~~~~~">
+        errorLine1="        cameraController.takePicture(outputFileOptions, directExecutor(), onImageSavedCallback)"
+        errorLine2="                                                        ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/EffectsFragment.kt"/>
     </issue>
@@ -157,8 +157,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            directExecutor()"
-        errorLine2="            ~~~~~~~~~~~~~~">
+        errorLine1="            cameraController.startRecording(outputOptions, audioConfig, directExecutor()) {"
+        errorLine2="                                                                        ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/EffectsFragment.kt"/>
     </issue>
@@ -166,8 +166,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        cameraController.setImageAnalysisAnalyzer(mainThreadExecutor(),"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~~">
+        errorLine1="            mainThreadExecutor(),"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/MlKitFragment.kt"/>
     </issue>
@@ -184,8 +184,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
-        errorLine2="                   ~">
+        errorLine1="                Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
+        errorLine2="                       ~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -193,8 +193,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
-        errorLine2="                     ~~~">
+        errorLine1="                Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
+        errorLine2="                         ~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -202,8 +202,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
+        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -211,8 +211,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
-        errorLine2="                                                       ~~~~~~~~~">
+        errorLine1="                Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
+        errorLine2="                                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -229,8 +229,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                CameraXExecutors.directExecutor(),"
-        errorLine2="                                 ~~~~~~~~~~~~~~">
+        errorLine1="                    .start(CameraXExecutors.directExecutor(), generateVideoRecordEventListener())"
+        errorLine2="                                            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -319,8 +319,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                    VideoRecordEvent.Finalize.ERROR_SOURCE_INACTIVE -> Logger.d("
-        errorLine2="                                                                              ~">
+        errorLine1="                        Logger.d(TAG, &quot;Video saved to: $uri&quot;)"
+        errorLine2="                               ~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -328,8 +328,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                        TAG,"
-        errorLine2="                        ~~~">
+        errorLine1="                        Logger.d(TAG, &quot;Video saved to: $uri&quot;)"
+        errorLine2="                                 ~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -337,8 +337,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                        &quot;Video saved to: $uri&quot;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        Logger.d(TAG, &quot;Video saved to: $uri&quot;)"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -346,8 +346,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                    else -> Logger.e("
-        errorLine2="                                   ~">
+        errorLine1="                        Logger.e(TAG, &quot;Failed to save video: uri $uri with code (${event.error})&quot;)"
+        errorLine2="                               ~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -355,8 +355,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                        TAG,"
-        errorLine2="                        ~~~">
+        errorLine1="                        Logger.e(TAG, &quot;Failed to save video: uri $uri with code (${event.error})&quot;)"
+        errorLine2="                                 ~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -364,8 +364,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                        &quot;Failed to save video: uri $uri with code (${event.error})&quot;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        Logger.e(TAG, &quot;Failed to save video: uri $uri with code (${event.error})&quot;)"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
     </issue>
@@ -373,8 +373,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="    IMAGE_CAPTURE, mainThreadExecutor(), ToneMappingImageProcessor(), {}"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~">
+        errorLine1="    CameraEffect(IMAGE_CAPTURE, mainThreadExecutor(), ToneMappingImageProcessor(), {}) {"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/ToneMappingImageEffect.kt"/>
     </issue>
@@ -463,8 +463,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="ShaderProvider can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        private val TONE_MAPPING_SHADER_PROVIDER = object : ShaderProvider {"
-        errorLine2="                                                            ~~~~~~~~~~~~~~">
+        errorLine1="            object : ShaderProvider {"
+        errorLine2="                     ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/ToneMappingSurfaceProcessor.kt"/>
     </issue>
@@ -472,8 +472,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="ShaderProvider.createFragmentShader can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            override fun createFragmentShader(sampler: String, fragCoords: String): String {"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                override fun createFragmentShader(sampler: String, fragCoords: String): String {"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/ToneMappingSurfaceProcessor.kt"/>
     </issue>
@@ -517,8 +517,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="OpenGlRenderer.init can only be called from within the same library (androidx.camera:camera-core)"
-        errorLine1="            glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER)"
-        errorLine2="                       ~~~~">
+        errorLine1="        glExecutor.execute { glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER) }"
+        errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/ToneMappingSurfaceProcessor.kt"/>
     </issue>
@@ -526,8 +526,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="OpenGlRenderer.init can only be called from within the same library (androidx.camera:camera-core)"
-        errorLine1="            glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER)"
-        errorLine2="                            ~~~~~~~~~~~~~~~~">
+        errorLine1="        glExecutor.execute { glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER) }"
+        errorLine2="                                             ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/ToneMappingSurfaceProcessor.kt"/>
     </issue>
@@ -535,8 +535,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="OpenGlRenderer.init can only be called from within the same library (androidx.camera:camera-core)"
-        errorLine1="            glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER)"
-        errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="        glExecutor.execute { glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER) }"
+        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/ToneMappingSurfaceProcessor.kt"/>
     </issue>
@@ -562,8 +562,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="OpenGlRenderer.unregisterOutputSurface can only be called from within the same library (androidx.camera:camera-core)"
-        errorLine1="                glRenderer.unregisterOutputSurface(removedSurface)"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                    glRenderer.unregisterOutputSurface(removedSurface)"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/ToneMappingSurfaceProcessor.kt"/>
     </issue>
@@ -571,8 +571,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="OpenGlRenderer.unregisterOutputSurface can only be called from within the same library (androidx.camera:camera-core)"
-        errorLine1="                glRenderer.unregisterOutputSurface(removedSurface)"
-        errorLine2="                                                   ~~~~~~~~~~~~~~">
+        errorLine1="                    glRenderer.unregisterOutputSurface(removedSurface)"
+        errorLine2="                                                       ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/view/ToneMappingSurfaceProcessor.kt"/>
     </issue>
diff --git a/car/app/app-automotive/lint-baseline.xml b/car/app/app-automotive/lint-baseline.xml
index 67c3ab1..6260021 100644
--- a/car/app/app-automotive/lint-baseline.xml
+++ b/car/app/app-automotive/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="UnsafeOptInUsageError"
@@ -343,13 +343,4 @@
             file="src/main/java/androidx/car/app/hardware/common/PropertyUtils.java"/>
     </issue>
 
-    <issue
-        id="SupportAnnotationUsage"
-        message="This annotation does not apply for type com.google.common.collect.ImmutableMap&lt;java.util.Set&lt;androidx.car.app.hardware.common.CarZone>,java.util.Set&lt;java.lang.Integer>>; expected int"
-        errorLine1="    @HvacFanDirection"
-        errorLine2="    ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/car/app/hardware/common/CarPropertyProfile.java"/>
-    </issue>
-
 </issues>
diff --git a/car/app/app/lint-baseline.xml b/car/app/app/lint-baseline.xml
index e10674d..c9b0d1d 100644
--- a/car/app/app/lint-baseline.xml
+++ b/car/app/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="MissingPermission"
@@ -57,7 +57,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.ZonedDateTime#parse`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.ZonedDateTime#parse`"
         errorLine1="        ZonedDateTime zonedDateTime = ZonedDateTime.parse(&quot;2020-05-14T19:57:00-07:00[US/Pacific]&quot;);"
         errorLine2="                                                    ~~~~~">
         <location
@@ -93,7 +93,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#getSeconds`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#getSeconds`"
         errorLine1="                Duration.ofMillis(timeZone.getOffset(timeSinceEpochMillis)).getSeconds();"
         errorLine2="                                                                            ~~~~~~~~~~">
         <location
@@ -102,7 +102,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#ofMillis`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#ofMillis`"
         errorLine1="                Duration.ofMillis(timeZone.getOffset(timeSinceEpochMillis)).getSeconds();"
         errorLine2="                         ~~~~~~~~">
         <location
@@ -111,7 +111,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#getSeconds`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#getSeconds`"
         errorLine1="                Duration.ofMillis(timeZone.getOffset(timeSinceEpochMillis)).getSeconds();"
         errorLine2="                                                                            ~~~~~~~~~~">
         <location
@@ -120,7 +120,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#ofMillis`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#ofMillis`"
         errorLine1="                Duration.ofMillis(timeZone.getOffset(timeSinceEpochMillis)).getSeconds();"
         errorLine2="                         ~~~~~~~~">
         <location
@@ -129,7 +129,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#getSeconds`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#getSeconds`"
         errorLine1="                Duration.ofMillis(timeZone.getOffset(timeSinceEpochMillis)).getSeconds();"
         errorLine2="                                                                            ~~~~~~~~~~">
         <location
@@ -138,7 +138,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#ofMillis`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#ofMillis`"
         errorLine1="                Duration.ofMillis(timeZone.getOffset(timeSinceEpochMillis)).getSeconds();"
         errorLine2="                         ~~~~~~~~">
         <location
@@ -147,7 +147,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#getSeconds`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#getSeconds`"
         errorLine1="                Duration.ofMillis(timeZone.getOffset(timeSinceEpochMillis)).getSeconds();"
         errorLine2="                                                                            ~~~~~~~~~~">
         <location
@@ -156,7 +156,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#ofMillis`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#ofMillis`"
         errorLine1="                Duration.ofMillis(timeZone.getOffset(timeSinceEpochMillis)).getSeconds();"
         errorLine2="                         ~~~~~~~~">
         <location
@@ -165,7 +165,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.Collection#stream`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Collection#stream`"
         errorLine1="                .stream()"
         errorLine2="                 ~~~~~~">
         <location
@@ -174,7 +174,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.stream.Stream#mapToLong`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.stream.Stream#mapToLong`"
         errorLine1="                .mapToLong(List::size)"
         errorLine2="                 ~~~~~~~~~">
         <location
@@ -183,7 +183,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.stream.LongStream#sum`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.stream.LongStream#sum`"
         errorLine1="                .sum()).isEqualTo(6);"
         errorLine2="                 ~~~">
         <location
@@ -228,7 +228,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.ZonedDateTime#parse`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.ZonedDateTime#parse`"
         errorLine1="        ZonedDateTime arrivalTime = ZonedDateTime.parse(&quot;2020-05-14T19:57:00-07:00[US/Pacific]&quot;);"
         errorLine2="                                                  ~~~~~">
         <location
@@ -237,7 +237,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#ofHours`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#ofHours`"
         errorLine1="        Duration remainingTime = Duration.ofHours(10);"
         errorLine2="                                          ~~~~~~~">
         <location
@@ -264,7 +264,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#getSeconds`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#getSeconds`"
         errorLine1="        assertThat(travelEstimate.getRemainingTimeSeconds()).isEqualTo(remainingTime.getSeconds());"
         errorLine2="                                                                                     ~~~~~~~~~~">
         <location
@@ -282,7 +282,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.ZonedDateTime#parse`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.ZonedDateTime#parse`"
         errorLine1="        ZonedDateTime arrivalTime = ZonedDateTime.parse(&quot;2020-05-14T19:57:00-07:00[US/Pacific]&quot;);"
         errorLine2="                                                  ~~~~~">
         <location
@@ -309,7 +309,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 21): `java.time.Duration#ofSeconds`"
+        message="Call requires API level 26, or core library desugaring (current min is 21): `java.time.Duration#ofSeconds`"
         errorLine1="                        Duration.ofSeconds(REMAINING_TIME_UNKNOWN)).build();"
         errorLine2="                                 ~~~~~~~~~">
         <location
@@ -327,7 +327,7 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: CarAppApiLevels.UNKNOWN, CarAppApiLevels.LEVEL_1, CarAppApiLevels.LEVEL_2, CarAppApiLevels.LEVEL_3, CarAppApiLevels.LEVEL_4, CarAppApiLevels.LEVEL_5, CarAppApiLevels.LEVEL_6, CarAppApiLevels.LEVEL_7"
+        message="Must be one of: CarAppApiLevels.UNKNOWN, CarAppApiLevels.LEVEL_1, CarAppApiLevels.LEVEL_2, CarAppApiLevels.LEVEL_3, CarAppApiLevels.LEVEL_4, CarAppApiLevels.LEVEL_5, CarAppApiLevels.LEVEL_6, CarAppApiLevels.LEVEL_7, CarAppApiLevels.LEVEL_8"
         errorLine1="        mCarAppApiLevel = handshakeInfo.getHostCarAppApiLevel();"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/compose/animation/animation-core/lint-baseline.xml b/compose/animation/animation-core/lint-baseline.xml
index 352cbc1..6687669 100644
--- a/compose/animation/animation-core/lint-baseline.xml
+++ b/compose/animation/animation-core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha09" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha09)" variant="all" version="8.4.0-alpha09">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
@@ -13,7 +13,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field visibilityThresholdMap with type Map&lt;TwoWayConverter&lt;?, ?>, Float>: replace with ObjectFloatMap"
-        errorLine1="internal val visibilityThresholdMap: Map&lt;TwoWayConverter&lt;*, *>, Float> = mapOf("
+        errorLine1="internal val visibilityThresholdMap: Map&lt;TwoWayConverter&lt;*, *>, Float> ="
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/animation/core/VisibilityThresholds.kt"/>
@@ -22,7 +22,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type Map&lt;TwoWayConverter&lt;?, ?>, Float> of getVisibilityThresholdMap: replace with ObjectFloatMap"
-        errorLine1="internal val visibilityThresholdMap: Map&lt;TwoWayConverter&lt;*, *>, Float> = mapOf("
+        errorLine1="internal val visibilityThresholdMap: Map&lt;TwoWayConverter&lt;*, *>, Float> ="
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/animation/core/VisibilityThresholds.kt"/>
diff --git a/compose/animation/animation-graphics/lint-baseline.xml b/compose/animation/animation-graphics/lint-baseline.xml
index bdc4bc5..14141af 100644
--- a/compose/animation/animation-graphics/lint-baseline.xml
+++ b/compose/animation/animation-graphics/lint-baseline.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="PathParser.createPathFromPathData can only be called from within the same library (androidx.core:core)"
+        errorLine1="                    PathInterpolator(PathParser.createPathFromPathData(pathData)).toEasing()"
+        errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/animation/graphics/vector/compat/XmlAnimatorParser.android.kt"/>
+    </issue>
 
     <issue
         id="PrimitiveInCollection"
         message="field builtinInterpolators with type HashMap&lt;Integer, Easing>: replace with IntObjectMap"
-        errorLine1="private val builtinInterpolators = hashMapOf("
+        errorLine1="private val builtinInterpolators ="
         errorLine2="^">
         <location
             file="src/androidMain/kotlin/androidx/compose/animation/graphics/res/AnimatorResources.android.kt"/>
diff --git a/compose/animation/animation/integration-tests/animation-demos/lint-baseline.xml b/compose/animation/animation/integration-tests/animation-demos/lint-baseline.xml
index 7ef4d21..2fb88cf 100644
--- a/compose/animation/animation/integration-tests/animation-demos/lint-baseline.xml
+++ b/compose/animation/animation/integration-tests/animation-demos/lint-baseline.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha09" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha09)" variant="all" version="8.4.0-alpha09">
-
-    <issue
-        id="PrimitiveInCollection"
-        message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
-        errorLine2="^">
-        <location
-            file="src/main/java/androidx/compose/animation/demos/layoutanimation/AnimateEnterExitDemo.kt"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
@@ -22,7 +13,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field turquoiseColors with type List&lt;Color>: replace with LongList"
-        errorLine1="internal val turquoiseColors = listOf("
+        errorLine1="internal val turquoiseColors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/layoutanimation/AnimatedVisiblilityLazyColumnDemo.kt"/>
@@ -31,7 +22,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Color> of getTurquoiseColors: replace with LongList"
-        errorLine1="internal val turquoiseColors = listOf("
+        errorLine1="internal val turquoiseColors ="
         errorLine2="             ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/animation/demos/layoutanimation/AnimatedVisiblilityLazyColumnDemo.kt"/>
@@ -40,7 +31,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/gesture/FancyScrollingDemo.kt"/>
@@ -49,7 +40,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithFlowRowDemo.kt"/>
@@ -58,7 +49,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithIntrinsicsDemo.kt"/>
@@ -67,7 +58,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field res with type List&lt;Integer>: replace with IntList"
-        errorLine1="val res = listOf("
+        errorLine1="val res ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithLazyColumn.kt"/>
@@ -76,7 +67,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Integer> of getRes: replace with IntList"
-        errorLine1="val res = listOf("
+        errorLine1="val res ="
         errorLine2="    ~~~">
         <location
             file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithLazyColumn.kt"/>
@@ -85,7 +76,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithMovableContentDemo.kt"/>
@@ -94,7 +85,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithScaffold.kt"/>
@@ -103,7 +94,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithSubcompose.kt"/>
@@ -112,7 +103,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/visualinspection/SeekingDebugging.kt"/>
@@ -121,7 +112,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/gesture/SpringBackScrollingDemo.kt"/>
@@ -130,7 +121,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field vibrantColors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val vibrantColors = listOf("
+        errorLine1="private val vibrantColors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/fancy/SpringChainDemo.kt"/>
@@ -139,7 +130,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field pastelColors with type List&lt;Color>: replace with LongList"
-        errorLine1="internal val pastelColors = listOf("
+        errorLine1="internal val pastelColors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/animation/demos/gesture/SwipeToDismissDemo.kt"/>
@@ -148,7 +139,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Color> of getPastelColors: replace with LongList"
-        errorLine1="internal val pastelColors = listOf("
+        errorLine1="internal val pastelColors ="
         errorLine2="             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/animation/demos/gesture/SwipeToDismissDemo.kt"/>
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml b/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml
index 2a3618a..98b4fb5 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.Map#getOrDefault`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Map#getOrDefault`"
         errorLine1="                val selected = selectedIndexes.getOrDefault(item, false)"
         errorLine2="                                               ~~~~~~~~~~~~">
         <location
@@ -11,36 +11,9 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.compose.foundation.demos.ListDemosKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                val selected = selectedIndexes.getOrDefault(item, false)"
-        errorLine2="                                               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="field RainbowColors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val RainbowColors = listOf("
-        errorLine2="^">
-        <location
-            file="src/main/java/androidx/compose/foundation/demos/text/BrushDemo.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="field RainbowStops with type List&lt;Float>: replace with FloatList"
-        errorLine1="private val RainbowStops = listOf(0f, 0.2f, 0.4f, 0.6f, 0.8f, 1f)"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/compose/foundation/demos/text/BrushDemo.kt"/>
-    </issue>
-
-    <issue
         id="PrimitiveInCollection"
         message="variable options with type List&lt;? extends Alignment>: replace with FloatList"
-        errorLine1="    val options = listOf("
+        errorLine1="    val options ="
         errorLine2="    ^">
         <location
             file="src/main/java/androidx/compose/foundation/demos/text/ComposeLineHeight.kt"/>
@@ -49,8 +22,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable options with type List&lt;? extends Trim>: replace with IntList"
-        errorLine1="    val options = listOf("
-        errorLine2="    ^">
+        errorLine1="    val options = listOf(Trim.Both, Trim.None, Trim.FirstLineTop, Trim.LastLineBottom)"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/foundation/demos/text/ComposeLineHeight.kt"/>
     </issue>
@@ -67,7 +40,7 @@
     <issue
         id="PrimitiveInCollection"
         message="variable colorList with type List&lt;? extends Color>: replace with LongList"
-        errorLine1="    val colorList = listOf("
+        errorLine1="    val colorList ="
         errorLine2="    ^">
         <location
             file="src/main/java/androidx/compose/foundation/demos/text/ComposeTextSelection.kt"/>
@@ -76,7 +49,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field blendModes with type List&lt;BlendMode>: replace with IntList"
-        errorLine1="private val blendModes = listOf("
+        errorLine1="private val blendModes ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/foundation/demos/text/DrawTextDemo.kt"/>
@@ -93,15 +66,6 @@
 
     <issue
         id="PrimitiveInCollection"
-        message="field RainbowColors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val RainbowColors = listOf("
-        errorLine2="^">
-        <location
-            file="src/main/java/androidx/compose/foundation/demos/text/DrawTextDemo.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
         message="variable list with type List&lt;? extends Integer>: replace with IntList"
         errorLine1="    var list by remember { mutableStateOf(List(50) { it }) }"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -139,7 +103,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field colors with type List&lt;Color>: replace with LongList"
-        errorLine1="private val colors = listOf("
+        errorLine1="private val colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
@@ -157,8 +121,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable heights with type List&lt;? extends Dp>: replace with FloatList"
-        errorLine1="    val heights = remember {"
-        errorLine2="    ^">
+        errorLine1="    val heights = remember { List(100) { (Random.nextInt(100) + 100).dp } }"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
     </issue>
@@ -166,8 +130,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable colors with type List&lt;? extends Color>: replace with LongList"
-        errorLine1="    val colors = remember {"
-        errorLine2="    ^">
+        errorLine1="    val colors = remember { List(100) { Color.hsl(Random.nextFloat() * 360, .5f, .65f) } }"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
     </issue>
@@ -175,8 +139,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable items with type SnapshotStateList&lt;Integer>: replace with IntList"
-        errorLine1="    val items = remember {"
-        errorLine2="    ^">
+        errorLine1="    val items = remember { mutableStateListOf&lt;Int>().apply { repeat(20) { add(it) } } }"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
     </issue>
@@ -220,7 +184,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field modifierKeys with type Set&lt;Integer>: replace with IntSet"
-        errorLine1="private val modifierKeys = setOf("
+        errorLine1="private val modifierKeys ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/foundation/demos/text/TextFieldFocusDemo.kt"/>
diff --git a/compose/foundation/foundation/lint-baseline.xml b/compose/foundation/foundation/lint-baseline.xml
index 3978436..ba80c20 100644
--- a/compose/foundation/foundation/lint-baseline.xml
+++ b/compose/foundation/foundation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-alpha05)" variant="all" version="8.6.0-alpha05">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
@@ -212,42 +212,6 @@
         id="PrimitiveInCollection"
         message="return type List&lt;Integer> of getHeaderIndexes: replace with IntList"
         errorLine1="    val headerIndexes: List&lt;Int>"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="variable varb332d665 with type List&lt;Integer>: replace with IntList"
-        errorLine1="        get() = _headerIndexes ?: emptyList()"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="variable headersIndexes with type List&lt;Integer>: replace with IntList"
-        errorLine1="        val headersIndexes = _headerIndexes ?: mutableListOf&lt;Int>().also { _headerIndexes = it }"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="variable varb3336cf1 with type List&lt;Integer>: replace with IntList"
-        errorLine1="        val headersIndexes = _headerIndexes ?: mutableListOf&lt;Int>().also { _headerIndexes = it }"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="return type List&lt;Integer> of getHeaderIndexes: replace with IntList"
-        errorLine1="    val headerIndexes: List&lt;Int>"
         errorLine2="                       ~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListItemProvider.kt"/>
diff --git a/compose/material/material/integration-tests/material-demos/lint-baseline.xml b/compose/material/material/integration-tests/material-demos/lint-baseline.xml
index c9e4f70..40e3012 100644
--- a/compose/material/material/integration-tests/material-demos/lint-baseline.xml
+++ b/compose/material/material/integration-tests/material-demos/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha04" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha04)" variant="all" version="8.3.0-alpha04">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
         message="field elevations with type List&lt;Dp>: replace with FloatList"
-        errorLine1="private val elevations = listOf("
-        errorLine2="^">
+        errorLine1="private val elevations = listOf(0.dp, 1.dp, 2.dp, 3.dp, 4.dp, 6.dp, 8.dp, 12.dp, 16.dp, 24.dp)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/material/demos/ElevationDemo.kt"/>
     </issue>
diff --git a/compose/material/material/lint-baseline.xml b/compose/material/material/lint-baseline.xml
index 0c38375..b2ceca1 100644
--- a/compose/material/material/lint-baseline.xml
+++ b/compose/material/material/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -119,24 +119,6 @@
     </issue>
 
     <issue
-        id="ComposableNaming"
-        message="Composable functions with a return type should start with a lowercase letter"
-        errorLine1="    fun Url("
-        errorLine2="        ~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material/Text.kt"/>
-    </issue>
-
-    <issue
-        id="ComposableNaming"
-        message="Composable functions with a return type should start with a lowercase letter"
-        errorLine1="    fun Clickable("
-        errorLine2="        ~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material/Text.kt"/>
-    </issue>
-
-    <issue
         id="PrimitiveInCollection"
         message="variable crossAxisSizes with type List&lt;Integer>: replace with IntList"
         errorLine1="        val crossAxisSizes = mutableListOf&lt;Int>()"
@@ -202,8 +184,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable tickFractions with type List&lt;? extends Float>: replace with FloatList"
-        errorLine1="    val tickFractions = remember(steps) {"
-        errorLine2="    ^">
+        errorLine1="    val tickFractions = remember(steps) { stepsToTickFractions(steps) }"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
     </issue>
@@ -211,8 +193,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable tickFractions with type List&lt;? extends Float>: replace with FloatList"
-        errorLine1="    val tickFractions = remember(steps) {"
-        errorLine2="    ^">
+        errorLine1="    val tickFractions = remember(steps) { stepsToTickFractions(steps) }"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
     </issue>
@@ -265,8 +247,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable anchors with type Map&lt;Float, DismissValue>: replace with FloatObjectMap"
-        errorLine1="    val anchors = mutableMapOf(0f to Default)"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="        val anchors = mutableMapOf(0f to Default)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/SwipeToDismiss.kt"/>
     </issue>
@@ -300,18 +282,18 @@
 
     <issue
         id="PrimitiveInCollection"
-        message="method processNewAnchors$material has parameter oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        oldAnchors: Map&lt;Float, T>,"
-        errorLine2="                    ~~~~~~~~~~~~~">
+        message="method processNewAnchors$material has parameter newAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
+        errorLine1="    internal suspend fun processNewAnchors(oldAnchors: Map&lt;Float, T>, newAnchors: Map&lt;Float, T>) {"
+        errorLine2="                                                                                  ~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
     </issue>
 
     <issue
         id="PrimitiveInCollection"
-        message="method processNewAnchors$material has parameter newAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        newAnchors: Map&lt;Float, T>"
-        errorLine2="                    ~~~~~~~~~~~~~">
+        message="method processNewAnchors$material has parameter oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
+        errorLine1="    internal suspend fun processNewAnchors(oldAnchors: Map&lt;Float, T>, newAnchors: Map&lt;Float, T>) {"
+        errorLine2="                                                       ~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
     </issue>
@@ -337,8 +319,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        val oldAnchors = state.anchors"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            val oldAnchors = state.anchors"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
     </issue>
@@ -346,8 +328,8 @@
     <issue
         id="PrimitiveInCollection"
         message="method findBounds has parameter anchors with type Set&lt;Float>: replace with FloatSet"
-        errorLine1="    anchors: Set&lt;Float>"
-        errorLine2="             ~~~~~~~~~~">
+        errorLine1="private fun findBounds(offset: Float, anchors: Set&lt;Float>): List&lt;Float> {"
+        errorLine2="                                               ~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
     </issue>
@@ -355,8 +337,8 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Float> of findBounds: replace with FloatList"
-        errorLine1="): List&lt;Float> {"
-        errorLine2="   ~~~~~~~~~~~">
+        errorLine1="private fun findBounds(offset: Float, anchors: Set&lt;Float>): List&lt;Float> {"
+        errorLine2="                                                            ~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
     </issue>
diff --git a/compose/material3/material3/integration-tests/material3-catalog/lint-baseline.xml b/compose/material3/material3/integration-tests/material3-catalog/lint-baseline.xml
index 2693060..40985cd 100644
--- a/compose/material3/material3/integration-tests/material3-catalog/lint-baseline.xml
+++ b/compose/material3/material3/integration-tests/material3-catalog/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
         message="constructor Theme has parameter map with type Map&lt;String, Float>: replace with ObjectFloatMap"
-        errorLine1="    constructor(map: Map&lt;String, Float>) : this("
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~">
+        errorLine1="        map: Map&lt;String, Float>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/material3/catalog/library/model/Themes.kt"/>
     </issue>
@@ -13,7 +13,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type Map&lt;String, Float> of toMap: replace with ObjectFloatMap"
-        errorLine1="    fun toMap() = mapOf("
+        errorLine1="    fun toMap() ="
         errorLine2="        ~~~~~">
         <location
             file="src/main/java/androidx/compose/material3/catalog/library/model/Themes.kt"/>
@@ -22,7 +22,7 @@
     <issue
         id="PrimitiveInCollection"
         message="variable themeMap with type Map&lt;String, ? extends Float>: replace with ObjectFloatMap"
-        errorLine1="        val themeMap = themeString.substring(1, themeString.length - 1)"
+        errorLine1="        val themeMap ="
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/compose/material3/catalog/library/data/UserPreferencesRepository.kt"/>
diff --git a/compose/material3/material3/lint-baseline.xml b/compose/material3/material3/lint-baseline.xml
index 6e32e2f..7efb2b1 100644
--- a/compose/material3/material3/lint-baseline.xml
+++ b/compose/material3/material3/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -155,73 +155,6 @@
     </issue>
 
     <issue
-        id="ComposableNaming"
-        message="Composable functions with a return type should start with a lowercase letter"
-        errorLine1="    fun Url("
-        errorLine2="        ~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/Text.kt"/>
-    </issue>
-
-    <issue
-        id="ComposableNaming"
-        message="Composable functions with a return type should start with a lowercase letter"
-        errorLine1="    fun Clickable("
-        errorLine2="        ~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/Text.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.compose.material3.ExperimentalMaterial3Api` or `@OptIn(markerClass = androidx.compose.material3.ExperimentalMaterial3Api.class)`">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/ColorScheme.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.compose.material3.ExperimentalMaterial3Api` or `@OptIn(markerClass = androidx.compose.material3.ExperimentalMaterial3Api.class)`">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/ColorScheme.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.compose.material3.ExperimentalMaterial3Api` or `@OptIn(markerClass = androidx.compose.material3.ExperimentalMaterial3Api.class)`">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/ColorScheme.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.compose.material3.ExperimentalMaterial3Api` or `@OptIn(markerClass = androidx.compose.material3.ExperimentalMaterial3Api.class)`">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/ColorScheme.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.compose.material3.ExperimentalMaterial3Api` or `@OptIn(markerClass = androidx.compose.material3.ExperimentalMaterial3Api.class)`">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/ColorScheme.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.compose.material3.ExperimentalMaterial3Api` or `@OptIn(markerClass = androidx.compose.material3.ExperimentalMaterial3Api.class)`">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/ColorScheme.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.compose.material3.ExperimentalMaterial3Api` or `@OptIn(markerClass = androidx.compose.material3.ExperimentalMaterial3Api.class)`">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/ColorScheme.kt"/>
-    </issue>
-
-    <issue
         id="PrimitiveInCollection"
         message="variable crossAxisSizes with type List&lt;Integer>: replace with IntList"
         errorLine1="        val crossAxisSizes = mutableListOf&lt;Int>()"
@@ -248,40 +181,4 @@
             file="src/commonMain/kotlin/androidx/compose/material3/TabRow.kt"/>
     </issue>
 
-    <issue
-        id="PrimitiveInCollection"
-        message="return type List&lt;Integer> of getValues$lint_module: replace with IntList"
-        errorLine1="    internal val values get() = if (selection == Selection.Minute) Minutes else Hours"
-        errorLine2="                 ~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/TimePicker.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="field Minutes with type List&lt;Integer>: replace with IntList"
-        errorLine1="private val Minutes = listOf(0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55)"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/TimePicker.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="field Hours with type List&lt;Integer>: replace with IntList"
-        errorLine1="private val Hours = listOf(12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/TimePicker.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInCollection"
-        message="field ExtraHours with type List&lt;Integer>: replace with IntList"
-        errorLine1="private val ExtraHours = Hours.fastMap { (it % 12 + 12) }"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/TimePicker.kt"/>
-    </issue>
-
 </issues>
diff --git a/compose/runtime/runtime-test-utils/lint-baseline.xml b/compose/runtime/runtime-test-utils/lint-baseline.xml
index 6d10e42..8868abf 100644
--- a/compose/runtime/runtime-test-utils/lint-baseline.xml
+++ b/compose/runtime/runtime-test-utils/lint-baseline.xml
@@ -1,104 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha06)" variant="all" version="8.5.0-alpha06">
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="    val filtered get() = contacts.filter { it.name.contains(filter) }"
-        errorLine2="                                  ~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/ContactModel.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="                    val toRun = awaiters.toList()"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/TestMonotonicFrameClock.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="                    toRun.map { it.runFrame(frameTime) }.forEach { it() }"
-        errorLine2="                          ~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/TestMonotonicFrameClock.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="                    toRun.map { it.runFrame(frameTime) }.forEach { it() }"
-        errorLine2="                                                         ~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/TestMonotonicFrameClock.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            children.forEach { it.render(indent + 2, builder) }"
-        errorLine2="                     ~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="                removedChildren.forEach { child -> child.parent = null }"
-        errorLine2="                                ~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            val copyOfItems = itemsToMove.map { it }"
-        errorLine2="                                          ~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        children.forEach { child -> child.parent = null }"
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        else attributes.map { &quot; ${it.key}=&apos;${it.value}&apos;&quot; }.joinToString()"
-        errorLine2="                                                           ~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        children.map { it.toString() }.joinToString(&quot; &quot;)"
-        errorLine2="                 ~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        children.map { it.toString() }.joinToString(&quot; &quot;)"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ListIterator"
@@ -109,13 +10,4 @@
             file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
     </issue>
 
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="fun View.flatten(): List&lt;View> = listOf(this) + children.flatMap { it.flatten() }"
-        errorLine2="                                                         ~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/runtime/mock/View.kt"/>
-    </issue>
-
 </issues>
diff --git a/compose/runtime/runtime/integration-tests/lint-baseline.xml b/compose/runtime/runtime/integration-tests/lint-baseline.xml
index 80c0abd..ddb52c8 100644
--- a/compose/runtime/runtime/integration-tests/lint-baseline.xml
+++ b/compose/runtime/runtime/integration-tests/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-beta03" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-beta03)" variant="all" version="8.0.0-beta03">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                    sleep(1)"
-        errorLine2="                    ~~~~~">
+        errorLine1="                        sleep(1)"
+        errorLine2="                        ~~~~~">
         <location
             file="src/androidInstrumentedTest/kotlin/androidx/compose/runtime/AndroidSnapshotTests.kt"/>
     </issue>
diff --git a/compose/runtime/runtime/lint-baseline.xml b/compose/runtime/runtime/lint-baseline.xml
index 457d006..db0da51 100644
--- a/compose/runtime/runtime/lint-baseline.xml
+++ b/compose/runtime/runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ExperimentalPropertyAnnotation"
@@ -22,8 +22,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable useDefault with type List&lt;? extends Integer>: replace with IntList"
-        errorLine1="            val useDefault ="
-        errorLine2="            ^">
+        errorLine1="                val useDefault ="
+        errorLine2="                ^">
         <location
             file="src/jvmMain/kotlin/androidx/compose/runtime/reflect/ComposableMethod.jvm.kt"/>
     </issue>
@@ -67,8 +67,8 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Integer> of keys: replace with IntList"
-        errorLine1="    private fun keys() = groups.keys(groupsSize * Group_Fields_Size)"
-        errorLine2="                ~~~~">
+        errorLine1="    @Suppress(&quot;unused&quot;) private fun keys() = groups.keys(groupsSize * Group_Fields_Size)"
+        errorLine2="                                    ~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
     </issue>
@@ -76,8 +76,8 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Integer> of nodes: replace with IntList"
-        errorLine1="    private fun nodes() = groups.nodeCounts(groupsSize * Group_Fields_Size)"
-        errorLine2="                ~~~~~">
+        errorLine1="    @Suppress(&quot;unused&quot;) private fun nodes() = groups.nodeCounts(groupsSize * Group_Fields_Size)"
+        errorLine2="                                    ~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
     </issue>
@@ -103,8 +103,8 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Integer> of groupSizes: replace with IntList"
-        errorLine1="    private fun groupSizes() = groups.groupSizes(groupsSize * Group_Fields_Size)"
-        errorLine2="                ~~~~~~~~~~">
+        errorLine1="    @Suppress(&quot;unused&quot;) private fun groupSizes() = groups.groupSizes(groupsSize * Group_Fields_Size)"
+        errorLine2="                                    ~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
     </issue>
@@ -112,7 +112,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Integer> of dataIndexes: replace with IntList"
-        errorLine1="    private fun IntArray.dataIndexes() = groups.dataAnchors().let {"
+        errorLine1="    private fun IntArray.dataIndexes() ="
         errorLine2="                         ~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
@@ -121,7 +121,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Integer> of keys: replace with IntList"
-        errorLine1="    private fun keys() = groups.keys().fastFilterIndexed { index, _ ->"
+        errorLine1="    private fun keys() ="
         errorLine2="                ~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
@@ -130,7 +130,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Integer> of keys: replace with IntList"
-        errorLine1="private fun IntArray.keys(len: Int = size) ="
+        errorLine1="private fun IntArray.keys(len: Int = size) = slice(Key_Offset until len step Group_Fields_Size)"
         errorLine2="                     ~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/runtime/SlotTable.kt"/>
diff --git a/compose/ui/ui-text/lint-baseline.xml b/compose/ui/ui-text/lint-baseline.xml
index d8802c0..b56dacd 100644
--- a/compose/ui/ui-text/lint-baseline.xml
+++ b/compose/ui/ui-text/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha03" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha03)" variant="all" version="8.5.0-alpha03">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="NewApi"
@@ -85,8 +85,8 @@
     <issue
         id="ListIterator"
         message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="                        &quot;&apos;$key&apos; must be unique. Actual [ [${value.joinToString()}]&quot;"
-        errorLine2="                                                                  ~~~~~~~~~~~~">
+        errorLine1="                                &quot;&apos;$key&apos; must be unique. Actual [ [${value.joinToString()}]&quot;"
+        errorLine2="                                                                          ~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/ui/text/font/FontVariation.kt"/>
     </issue>
@@ -121,8 +121,8 @@
     <issue
         id="PrimitiveInCollection"
         message="method collectRangeTransitions has parameter target with type SortedSet&lt;Integer>: replace with IntSet"
-        errorLine1="    target: SortedSet&lt;Int>"
-        errorLine2="            ~~~~~~~~~~~~~~">
+        errorLine1="private fun collectRangeTransitions(ranges: List&lt;Range&lt;*>>?, target: SortedSet&lt;Int>) {"
+        errorLine2="                                                                     ~~~~~~~~~~~~~~">
         <location
             file="src/jvmMain/kotlin/androidx/compose/ui/text/JvmAnnotatedString.jvm.kt"/>
     </issue>
@@ -148,8 +148,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable list with type List&lt;? extends Float>: replace with FloatList"
-        errorLine1="        @Suppress(&quot;UNCHECKED_CAST&quot;)"
-        errorLine2="        ^">
+        errorLine1="            @Suppress(&quot;UNCHECKED_CAST&quot;) val list = it as List&lt;Float>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt"/>
     </issue>
@@ -175,8 +175,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable set with type TreeSet&lt;Integer>: replace with IntSet"
-        errorLine1="        val set = TreeSet&lt;Int>().apply {"
-        errorLine2="        ^">
+        errorLine1="        val set = TreeSet&lt;Int>().apply { words.fastForEach { add(it) } }"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:compose:ui:ui-text*debug*MAIN*sourceProvider*0*javaDir*4}/androidx/compose/ui/text/android/animation/SegmentBreaker.android.kt"/>
     </issue>
diff --git a/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml b/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml
index 517882b..4d4a40d 100644
--- a/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml
+++ b/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha04" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha04)" variant="all" version="8.3.0-alpha04">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
         message="field Colors with type List&lt;Color>: replace with LongList"
-        errorLine1="internal val Colors = listOf("
+        errorLine1="internal val Colors ="
         errorLine2="^">
         <location
             file="src/main/java/androidx/compose/ui/demos/gestures/Colors.kt"/>
@@ -13,7 +13,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Color> of getColors: replace with LongList"
-        errorLine1="internal val Colors = listOf("
+        errorLine1="internal val Colors ="
         errorLine2="             ~~~~~~">
         <location
             file="src/main/java/androidx/compose/ui/demos/gestures/Colors.kt"/>
diff --git a/compose/ui/ui/lint-baseline.xml b/compose/ui/ui/lint-baseline.xml
index 6b4b404..5ce4ebe 100644
--- a/compose/ui/ui/lint-baseline.xml
+++ b/compose/ui/ui/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha09" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha09)" variant="all" version="8.4.0-alpha09">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -20,33 +20,6 @@
     </issue>
 
     <issue
-        id="ExperimentalPropertyAnnotation"
-        message="This property does not have all required annotations to correctly mark it as experimental."
-        errorLine1="    @ExperimentalComposeUiApi"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsProperties.kt"/>
-    </issue>
-
-    <issue
-        id="ExperimentalPropertyAnnotation"
-        message="This property does not have all required annotations to correctly mark it as experimental."
-        errorLine1="    @get:ExperimentalComposeUiApi"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/ui/platform/WindowInfo.kt"/>
-    </issue>
-
-    <issue
-        id="ExperimentalPropertyAnnotation"
-        message="This property does not have all required annotations to correctly mark it as experimental."
-        errorLine1="    @get:ExperimentalComposeUiApi"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/ui/platform/WindowInfo.kt"/>
-    </issue>
-
-    <issue
         id="PrimitiveInCollection"
         message="field children with type Map&lt;Integer, AutofillNode>: replace with IntObjectMap"
         errorLine1="    val children: MutableMap&lt;Int, AutofillNode> = mutableMapOf()"
@@ -67,7 +40,7 @@
     <issue
         id="PrimitiveInCollection"
         message="variable deltas with type List&lt;? extends Offset>: replace with LongList"
-        errorLine1="    val deltas = items.fastZipWithNext { el1, el2 ->"
+        errorLine1="    val deltas ="
         errorLine2="    ^">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/accessibility/CollectionInfo.android.kt"/>
@@ -76,7 +49,7 @@
     <issue
         id="PrimitiveInCollection"
         message="return type Map&lt;LayoutNode, Integer> of getMapOfOriginalDepth: replace with ObjectIntMap"
-        errorLine1="    private val mapOfOriginalDepth by lazy(LazyThreadSafetyMode.NONE) {"
+        errorLine1="    private val mapOfOriginalDepth by"
         errorLine2="                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/commonMain/kotlin/androidx/compose/ui/node/DepthSortedSet.kt"/>
diff --git a/constraintlayout/constraintlayout-compose/integration-tests/demos/lint-baseline.xml b/constraintlayout/constraintlayout-compose/integration-tests/demos/lint-baseline.xml
index e6cb82a..2bd372a 100644
--- a/constraintlayout/constraintlayout-compose/integration-tests/demos/lint-baseline.xml
+++ b/constraintlayout/constraintlayout-compose/integration-tests/demos/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
@@ -49,7 +49,7 @@
     <issue
         id="PrimitiveInCollection"
         message="variable weights with type List&lt;? extends Float>: replace with FloatList"
-        errorLine1="                    val weights = when (mode) {"
+        errorLine1="                    val weights ="
         errorLine2="                    ^">
         <location
             file="src/main/java/androidx/constraintlayout/compose/demos/StaggeredDemo.kt"/>
diff --git a/constraintlayout/constraintlayout-compose/lint-baseline.xml b/constraintlayout/constraintlayout-compose/lint-baseline.xml
index bff762e..a499513 100644
--- a/constraintlayout/constraintlayout-compose/lint-baseline.xml
+++ b/constraintlayout/constraintlayout-compose/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanInlineOptIn"
@@ -75,18 +75,18 @@
 
     <issue
         id="PrimitiveInCollection"
-        message="method processNewAnchors$constraintlayout_compose has parameter oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        oldAnchors: Map&lt;Float, T>,"
-        errorLine2="                    ~~~~~~~~~~~~~">
+        message="method processNewAnchors$constraintlayout_compose has parameter newAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
+        errorLine1="    internal suspend fun processNewAnchors(oldAnchors: Map&lt;Float, T>, newAnchors: Map&lt;Float, T>) {"
+        errorLine2="                                                                                  ~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
     </issue>
 
     <issue
         id="PrimitiveInCollection"
-        message="method processNewAnchors$constraintlayout_compose has parameter newAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        newAnchors: Map&lt;Float, T>"
-        errorLine2="                    ~~~~~~~~~~~~~">
+        message="method processNewAnchors$constraintlayout_compose has parameter oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
+        errorLine1="    internal suspend fun processNewAnchors(oldAnchors: Map&lt;Float, T>, newAnchors: Map&lt;Float, T>) {"
+        errorLine2="                                                       ~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
     </issue>
@@ -112,8 +112,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        val oldAnchors = state.anchors"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            val oldAnchors = state.anchors"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
     </issue>
@@ -121,8 +121,8 @@
     <issue
         id="PrimitiveInCollection"
         message="method findBounds has parameter anchors with type Set&lt;Float>: replace with FloatSet"
-        errorLine1="    anchors: Set&lt;Float>"
-        errorLine2="             ~~~~~~~~~~">
+        errorLine1="private fun findBounds(offset: Float, anchors: Set&lt;Float>): List&lt;Float> {"
+        errorLine2="                                               ~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
     </issue>
@@ -130,8 +130,8 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Float> of findBounds: replace with FloatList"
-        errorLine1="): List&lt;Float> {"
-        errorLine2="   ~~~~~~~~~~~">
+        errorLine1="private fun findBounds(offset: Float, anchors: Set&lt;Float>): List&lt;Float> {"
+        errorLine2="                                                            ~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/constraintlayout/compose/carousel/CarouselSwipeable.kt"/>
     </issue>
@@ -184,7 +184,7 @@
     <issue
         id="PrimitiveInCollection"
         message="variable anchors with type Map&lt;Float, ? extends String>: replace with FloatObjectMap"
-        errorLine1="    val anchors = if (currentIndex == 0) {"
+        errorLine1="    val anchors ="
         errorLine2="    ^">
         <location
             file="src/androidMain/kotlin/androidx/constraintlayout/compose/MotionCarousel.kt"/>
diff --git a/contentpager/contentpager/lint-baseline.xml b/contentpager/contentpager/lint-baseline.xml
index 31b44c8..929c588a 100644
--- a/contentpager/contentpager/lint-baseline.xml
+++ b/contentpager/contentpager/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="NewApi"
@@ -20,24 +20,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.contentpager.content.ContentPager is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            extras = extras.deepCopy();"
-        errorLine2="                            ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/contentpager/content/ContentPager.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.contentpager.content.Query is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return resolver.query("
-        errorLine2="                            ~~~~~">
-        <location
-            file="src/main/java/androidx/contentpager/content/Query.java"/>
-    </issue>
-
-    <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
         errorLine1="    public ContentPager(ContentResolver resolver, QueryRunner queryRunner) {"
diff --git a/core/core-ktx/lint-baseline.xml b/core/core-ktx/lint-baseline.xml
index 7597446..7ddaf5f 100644
--- a/core/core-ktx/lint-baseline.xml
+++ b/core/core-ktx/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="                } else if (Build.VERSION.SDK_INT >= 21 &amp;&amp; value is Size) {"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                    } else if (Build.VERSION.SDK_INT >= 21 &amp;&amp; value is Size) {"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/Bundle.kt"/>
     </issue>
@@ -13,8 +13,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="                } else if (Build.VERSION.SDK_INT >= 21 &amp;&amp; value is SizeF) {"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                    } else if (Build.VERSION.SDK_INT >= 21 &amp;&amp; value is SizeF) {"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/os/Bundle.kt"/>
     </issue>
@@ -121,7 +121,7 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="@RequiresApi(21)"
+        errorLine1="@RequiresApi(21) public inline operator fun Size.component1(): Int = width"
         errorLine2="~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Size.kt"/>
@@ -130,7 +130,7 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="@RequiresApi(21)"
+        errorLine1="@RequiresApi(21) public inline operator fun Size.component2(): Int = height"
         errorLine2="~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Size.kt"/>
@@ -139,7 +139,7 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="@RequiresApi(21)"
+        errorLine1="@RequiresApi(21) public inline operator fun SizeF.component1(): Float = width"
         errorLine2="~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Size.kt"/>
@@ -148,7 +148,7 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="@RequiresApi(21)"
+        errorLine1="@RequiresApi(21) public inline operator fun SizeF.component2(): Float = height"
         errorLine2="~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/util/Size.kt"/>
diff --git a/core/core-telecom/lint-baseline.xml b/core/core-telecom/lint-baseline.xml
deleted file mode 100644
index f0d5969..0000000
--- a/core/core-telecom/lint-baseline.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.core.telecom.util.ExperimentalAppActions` or `@OptIn(markerClass = androidx.core.telecom.util.ExperimentalAppActions.class)`"
-        errorLine1="    val voipParticipantActionRequestsChannel: Channel&lt;VoipParticipantActionRequest> ="
-        errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/telecom/internal/CallChannels.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.core.telecom.util.ExperimentalAppActions` or `@OptIn(markerClass = androidx.core.telecom.util.ExperimentalAppActions.class)`"
-        errorLine1="        fun toCallCompat(call: Call, scope: CoroutineScope, init: CallCompat.() -> Unit):"
-        errorLine2="                                                                  ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/telecom/internal/CallCompat.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.core.telecom.util.ExperimentalAppActions` or `@OptIn(markerClass = androidx.core.telecom.util.ExperimentalAppActions.class)`"
-        errorLine1="    private var mCapabilities: MutableList&lt;androidx.core.telecom.extensions.Capability> ="
-        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/telecom/CallsManager.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.core.telecom.util.ExperimentalAppActions` or `@OptIn(markerClass = androidx.core.telecom.util.ExperimentalAppActions.class)`"
-        errorLine1="        capabilities: List&lt;androidx.core.telecom.extensions.Capability>"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/telecom/CallsManager.kt"/>
-    </issue>
-
-    <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.core.telecom.util.ExperimentalAppActions` or `@OptIn(markerClass = androidx.core.telecom.util.ExperimentalAppActions.class)`"
-        errorLine1="    val participantsStateFlow: StateFlow&lt;Set&lt;Participant>>"
-        errorLine2="                                             ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/telecom/extensions/ParticipantClientExtension.kt"/>
-    </issue>
-
-</issues>
diff --git a/core/core/lint-baseline.xml b/core/core/lint-baseline.xml
index d68cb9b1..6a88d3f 100644
--- a/core/core/lint-baseline.xml
+++ b/core/core/lint-baseline.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.Optional#of`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Optional#of`"
         errorLine1="                return Optional.of(modeCompat);"
         errorLine2="                                ~~">
         <location
@@ -12,7 +12,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.Optional#empty`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Optional#empty`"
         errorLine1="        return Optional.empty();"
         errorLine2="                        ~~~~~">
         <location
@@ -21,7 +21,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.Optional#get`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Optional#get`"
         errorLine1="                findNativeMode(DisplayCompat.getSupportedModes(mContext, mDefaultDisplay)).get();"
         errorLine2="                                                                                           ~~~">
         <location
@@ -30,7 +30,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.Optional#get`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Optional#get`"
         errorLine1="                findNativeMode(DisplayCompat.getSupportedModes(mContext, secondDisplay)).get();"
         errorLine2="                                                                                         ~~~">
         <location
@@ -39,7 +39,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.Optional#get`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Optional#get`"
         errorLine1="                findNativeMode(DisplayCompat.getSupportedModes(mContext, mDefaultDisplay)).get();"
         errorLine2="                                                                                           ~~~">
         <location
@@ -48,7 +48,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 21): `java.util.Optional#get`"
+        message="Call requires API level 24, or core library desugaring (current min is 21): `java.util.Optional#get`"
         errorLine1="                findNativeMode(DisplayCompat.getSupportedModes(mContext, mDefaultDisplay)).get();"
         errorLine2="                                                                                           ~~~">
         <location
@@ -776,1347 +776,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat.TouchDelegateInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mInfo = new TouchDelegateInfo(targetMap);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat.TouchDelegateInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                return mInfo.getRegionCount();"
-        errorLine2="                             ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat.TouchDelegateInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                return mInfo.getRegionAt(index);"
-        errorLine2="                             ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat.TouchDelegateInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                AccessibilityNodeInfo info = mInfo.getTargetForRegion(region);"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.isImportantForAccessibility();"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setImportantForAccessibility(important);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.getDrawingOrder();"
-        errorLine2="                         ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setDrawingOrder(drawingOrderInParent);"
-        errorLine2="                  ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.isContextClickable();"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setContextClickable(contextClickable);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.getHintText();"
-        errorLine2="                         ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setHintText(hintText);"
-        errorLine2="                  ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.getAvailableExtraData();"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setAvailableExtraData(extraDataKeys);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 22; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return AccessibilityNodeInfoCompat.wrapNonNullInstance(mInfo.getTraversalBefore());"
-        errorLine2="                                                                         ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 22; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setTraversalBefore(view);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 22; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setTraversalBefore(root, virtualDescendantId);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 22; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return AccessibilityNodeInfoCompat.wrapNonNullInstance(mInfo.getTraversalAfter());"
-        errorLine2="                                                                         ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 22; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setTraversalAfter(view);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 22; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setTraversalAfter(root, virtualDescendantId);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.getTooltipText();"
-        errorLine2="                         ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setTooltipText(tooltipText);"
-        errorLine2="                  ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setPaneTitle(paneTitle);"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.getPaneTitle();"
-        errorLine2="                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.isScreenReaderFocusable();"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setScreenReaderFocusable(screenReaderFocusable);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.isShowingHintText();"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setShowingHintText(showingHintText);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.isHeading();"
-        errorLine2="                         ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setHeading(isHeading);"
-        errorLine2="                  ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.isTextEntryKey();"
-        errorLine2="                         ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setTextEntryKey(isTextEntryKey);"
-        errorLine2="                  ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            TouchDelegateInfo delegateInfo = mInfo.getTouchDelegateInfo();"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setTouchDelegateInfo(delegatedInfo.mInfo);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.core.os.LocaleListCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return LocaleList.matchesLanguageAndScript(supported, desired);"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/os/LocaleListCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.app.NotificationManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    mContext.checkSelfPermission(Manifest.permission.USE_FULL_SCREEN_INTENT);"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mWrapped = new PrecomputedText.Params.Builder(paint)"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .setBreakStrategy(strategy)"
-        errorLine2="                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .setHyphenationFrequency(frequency)"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .setTextDirection(textDir)"
-        errorLine2="                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .build();"
-        errorLine2="                         ~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mPaint = wrapped.getTextPaint();"
-        errorLine2="                             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mTextDir = wrapped.getTextDirection();"
-        errorLine2="                               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mBreakStrategy = wrapped.getBreakStrategy();"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mHyphenationFrequency = wrapped.getHyphenationFrequency();"
-        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (!mPaint.getTextLocales().equals(other.getTextPaint().getTextLocales())) {"
-        errorLine2="                            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (!mPaint.getTextLocales().equals(other.getTextPaint().getTextLocales())) {"
-        errorLine2="                                                                         ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        mPaint.getTextLocales(), mPaint.getTypeface(), mPaint.isElegantTextHeight(),"
-        errorLine2="                               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                sb.append(&quot;, textLocale=&quot; + mPaint.getTextLocales());"
-        errorLine2="                                                   ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.text.PrecomputedTextCompat.Params is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                sb.append(&quot;, variationSettings=&quot; + mPaint.getFontVariationSettings());"
-        errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        PrecomputedText.create(text, params.mWrapped), params);"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                StaticLayout.Builder.obtain(text, 0, text.length(), params.getTextPaint(),"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .setBreakStrategy(params.getBreakStrategy())"
-        errorLine2="                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .setHyphenationFrequency(params.getHyphenationFrequency())"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .setTextDirection(params.getTextDirection())"
-        errorLine2="                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .build();"
-        errorLine2="                         ~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mWrapped.getParagraphCount();"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mWrapped.getParagraphStart(paraIndex);"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.text.PrecomputedTextCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mWrapped.getParagraphEnd(paraIndex);"
-        errorLine2="                            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/text/PrecomputedTextCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        ShortcutInfo.Builder builder = new ShortcutInfo.Builder(mContext, mId)"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .setShortLabel(mLabel)"
-        errorLine2="                 ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .setIntents(mIntents);"
-        errorLine2="                 ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            builder.setIcon(mIcon.toIcon(mContext));"
-        errorLine2="                    ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            builder.setLongLabel(mLongLabel);"
-        errorLine2="                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            builder.setDisabledMessage(mDisabledMessage);"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            builder.setActivity(mActivity);"
-        errorLine2="                    ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            builder.setCategories(mCategories);"
-        errorLine2="                    ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        builder.setRank(mRank);"
-        errorLine2="                ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            builder.setExtras(mExtras);"
-        errorLine2="                    ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                builder.setPersons(persons);"
-        errorLine2="                        ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                builder.setLocusId(mLocusId.toLocusId());"
-        errorLine2="                        ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            builder.setLongLived(mIsLongLived);"
-        errorLine2="                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            builder.setExtras(buildLegacyExtrasBundle());"
-        errorLine2="                    ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return builder.build();"
-        errorLine2="                       ~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 22; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mExtras.putBoolean(EXTRA_LONG_LIVED, mIsLongLived);"
-        errorLine2="                ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 22; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return bundle.getBoolean(EXTRA_LONG_LIVED);"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (shortcutInfo.getLocusId() == null) return null;"
-        errorLine2="                             ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return LocusIdCompat.toLocusIdCompat(shortcutInfo.getLocusId());"
-        errorLine2="                                                              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return getLocusIdFromExtra(shortcutInfo.getExtras());"
-        errorLine2="                                                    ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mId = shortcutInfo.getId();"
-        errorLine2="                                     ~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mPackageName = shortcutInfo.getPackage();"
-        errorLine2="                                              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            Intent[] intents = shortcutInfo.getIntents();"
-        errorLine2="                                            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mActivity = shortcutInfo.getActivity();"
-        errorLine2="                                           ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mLabel = shortcutInfo.getShortLabel();"
-        errorLine2="                                        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mLongLabel = shortcutInfo.getLongLabel();"
-        errorLine2="                                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mDisabledMessage = shortcutInfo.getDisabledMessage();"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mInfo.mDisabledReason = shortcutInfo.getDisabledReason();"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mInfo.mDisabledReason = shortcutInfo.isEnabled()"
-        errorLine2="                                                     ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mCategories = shortcutInfo.getCategories();"
-        errorLine2="                                             ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mPersons = ShortcutInfoCompat.getPersonsFromExtra(shortcutInfo.getExtras());"
-        errorLine2="                                                                                 ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mUser = shortcutInfo.getUserHandle();"
-        errorLine2="                                       ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mLastChangedTimestamp = shortcutInfo.getLastChangedTimestamp();"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 30; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mInfo.mIsCached = shortcutInfo.isCached();"
-        errorLine2="                                               ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mIsDynamic = shortcutInfo.isDynamic();"
-        errorLine2="                                            ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mIsPinned = shortcutInfo.isPinned();"
-        errorLine2="                                           ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mIsDeclaredInManifest = shortcutInfo.isDeclaredInManifest();"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mIsImmutable = shortcutInfo.isImmutable();"
-        errorLine2="                                              ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mIsEnabled = shortcutInfo.isEnabled();"
-        errorLine2="                                            ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mHasKeyFieldsOnly = shortcutInfo.hasKeyFieldsOnly();"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mRank = shortcutInfo.getRank();"
-        errorLine2="                                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutInfoCompat.Builder is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.mExtras = shortcutInfo.getExtras();"
-        errorLine2="                                         ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).isRequestPinShortcutSupported();"
-        errorLine2="                           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).isRequestPinShortcutSupported();"
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).requestPinShortcut("
-        errorLine2="                           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).requestPinShortcut("
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            result = context.getSystemService(ShortcutManager.class)"
-        errorLine2="                             ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .createShortcutResultIntent(shortcut.toShortcutInfo());"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    context.getSystemService(ShortcutManager.class).getShortcuts(matchFlags);"
-        errorLine2="                            ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 30; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    context.getSystemService(ShortcutManager.class).getShortcuts(matchFlags);"
-        errorLine2="                                                                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            final ShortcutManager manager = context.getSystemService(ShortcutManager.class);"
-        errorLine2="                                                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                shortcuts.addAll(manager.getManifestShortcuts());"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                shortcuts.addAll(manager.getDynamicShortcuts());"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                shortcuts.addAll(manager.getPinnedShortcuts());"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (!context.getSystemService(ShortcutManager.class).addDynamicShortcuts(shortcuts)) {"
-        errorLine2="                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (!context.getSystemService(ShortcutManager.class).addDynamicShortcuts(shortcuts)) {"
-        errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).getMaxShortcutCountPerActivity();"
-        errorLine2="                           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).getMaxShortcutCountPerActivity();"
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).isRateLimitingActive();"
-        errorLine2="                           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).isRateLimitingActive();"
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).getIconMaxWidth();"
-        errorLine2="                           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).getIconMaxWidth();"
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).getIconMaxHeight();"
-        errorLine2="                           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(ShortcutManager.class).getIconMaxHeight();"
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).reportShortcutUsed(shortcutId);"
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).reportShortcutUsed(shortcutId);"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (!context.getSystemService(ShortcutManager.class).setDynamicShortcuts(shortcuts)) {"
-        errorLine2="                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (!context.getSystemService(ShortcutManager.class).setDynamicShortcuts(shortcuts)) {"
-        errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            List&lt;ShortcutInfo> shortcuts = context.getSystemService("
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    ShortcutManager.class).getDynamicShortcuts();"
-        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (!context.getSystemService(ShortcutManager.class).updateShortcuts(shortcuts)) {"
-        errorLine2="                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (!context.getSystemService(ShortcutManager.class).updateShortcuts(shortcuts)) {"
-        errorLine2="                                                                 ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .disableShortcuts(shortcutIds, disabledMessage);"
-        errorLine2="                     ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).enableShortcuts(shortcutIds);"
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).enableShortcuts(shortcutIds);"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).removeDynamicShortcuts(shortcutIds);"
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).removeDynamicShortcuts(shortcutIds);"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).removeAllDynamicShortcuts();"
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).removeAllDynamicShortcuts();"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        context.getSystemService(ShortcutManager.class).removeLongLivedShortcuts(shortcutIds);"
-        errorLine2="                ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 30; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        context.getSystemService(ShortcutManager.class).removeLongLivedShortcuts(shortcutIds);"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).pushDynamicShortcut("
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 30; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            context.getSystemService(ShortcutManager.class).pushDynamicShortcut("
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            final ShortcutManager sm = context.getSystemService(ShortcutManager.class);"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (sm.isRateLimitingActive()) {"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            final List&lt;ShortcutInfo> shortcuts = sm.getDynamicShortcuts();"
-        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                sm.removeDynamicShortcuts(Arrays.asList("
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 25; however, the containing class androidx.core.content.pm.ShortcutManagerCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            sm.addDynamicShortcuts(Arrays.asList(shortcut.toShortcutInfo()));"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.core.widget.TextViewCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            textView.setTextAppearance(resId);"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/widget/TextViewCompat.java"/>
-    </issue>
-
-    <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class is missing private constructor"
         errorLine1="public class NotificationCompat {"
diff --git a/credentials/credentials-play-services-auth/lint-baseline.xml b/credentials/credentials-play-services-auth/lint-baseline.xml
index 85ca277..d1ed771 100644
--- a/credentials/credentials-play-services-auth/lint-baseline.xml
+++ b/credentials/credentials-play-services-auth/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="UsesNonDefaultVisibleForTesting"
@@ -13,7 +13,7 @@
     <issue
         id="UsesNonDefaultVisibleForTesting"
         message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
+        errorLine1="    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) lateinit var executor: Executor"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/credentials/playservices/controllers/BeginSignIn/CredentialProviderBeginSignInController.kt"/>
diff --git a/credentials/credentials/lint-baseline.xml b/credentials/credentials/lint-baseline.xml
index 71eb501..5caa612 100644
--- a/credentials/credentials/lint-baseline.xml
+++ b/credentials/credentials/lint-baseline.xml
@@ -1,743 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val sliceBuilder = Slice.Builder("
-        errorLine2="                                     ^">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val sliceBuilder = Slice.Builder("
-        errorLine2="                                     ^">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                Uri.EMPTY, SliceSpec("
-        errorLine2="                           ^">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                Uri.EMPTY, SliceSpec("
-        errorLine2="                           ^">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .addText("
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .addText("
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .addText("
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .addText("
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            sliceBuilder.addAction("
-        errorLine2="                         ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            sliceBuilder.addAction("
-        errorLine2="                         ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                Slice.Builder(sliceBuilder)"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                Slice.Builder(sliceBuilder)"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .addHints(Collections.singletonList(SLICE_HINT_PENDING_INTENT))"
-        errorLine2="                     ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .addHints(Collections.singletonList(SLICE_HINT_PENDING_INTENT))"
-        errorLine2="                     ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .build(),"
-        errorLine2="                     ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .build(),"
-        errorLine2="                     ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return sliceBuilder.build()"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return sliceBuilder.build()"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            slice.items.forEach {"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            slice.items.forEach {"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (it.hasHint(SLICE_HINT_TITLE)) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (it.hasHint(SLICE_HINT_TITLE)) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    title = it.text"
-        errorLine2="                               ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    title = it.text"
-        errorLine2="                               ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                } else if (it.hasHint(SLICE_HINT_SUBTITLE)) {"
-        errorLine2="                              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                } else if (it.hasHint(SLICE_HINT_SUBTITLE)) {"
-        errorLine2="                              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    subtitle = it.text"
-        errorLine2="                                  ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    subtitle = it.text"
-        errorLine2="                                  ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                } else if (it.hasHint(SLICE_HINT_PENDING_INTENT)) {"
-        errorLine2="                              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                } else if (it.hasHint(SLICE_HINT_PENDING_INTENT)) {"
-        errorLine2="                              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    pendingIntent = it.action"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.Action.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    pendingIntent = it.action"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/Action.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val sliceBuilder = Slice.Builder("
-        errorLine2="                                     ^">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val sliceBuilder = Slice.Builder("
-        errorLine2="                                     ^">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                Uri.EMPTY, SliceSpec("
-        errorLine2="                           ^">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                Uri.EMPTY, SliceSpec("
-        errorLine2="                           ^">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .addAction("
-        errorLine2="                 ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .addAction("
-        errorLine2="                 ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    Slice.Builder(sliceBuilder)"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    Slice.Builder(sliceBuilder)"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .addHints(Collections.singletonList(SLICE_HINT_PENDING_INTENT))"
-        errorLine2="                         ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .addHints(Collections.singletonList(SLICE_HINT_PENDING_INTENT))"
-        errorLine2="                         ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .build(),"
-        errorLine2="                         ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .build(),"
-        errorLine2="                         ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .addText(title, /*subType=*/null, listOf(SLICE_HINT_TITLE))"
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                .addText(title, /*subType=*/null, listOf(SLICE_HINT_TITLE))"
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return sliceBuilder.build()"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return sliceBuilder.build()"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            slice.items.forEach {"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            slice.items.forEach {"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (it.hasHint(SLICE_HINT_PENDING_INTENT)) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (it.hasHint(SLICE_HINT_PENDING_INTENT)) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    pendingIntent = it.action"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    pendingIntent = it.action"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                } else if (it.hasHint(SLICE_HINT_TITLE)) {"
-        errorLine2="                              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                } else if (it.hasHint(SLICE_HINT_TITLE)) {"
-        errorLine2="                              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    title = it.text"
-        errorLine2="                               ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.AuthenticationAction.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    title = it.text"
-        errorLine2="                               ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/AuthenticationAction.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.CredentialEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                when (slice.spec?.type) {"
-        errorLine2="                            ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/CredentialEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.CredentialEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                when (slice.spec?.type) {"
-        errorLine2="                                  ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/CredentialEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.CredentialEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                when (slice.spec?.type) {"
-        errorLine2="                            ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/CredentialEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.CredentialEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                when (slice.spec?.type) {"
-        errorLine2="                                  ~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/CredentialEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val sliceBuilder = Slice.Builder(Uri.EMPTY, SliceSpec(SLICE_SPEC_TYPE, REVISION_ID))"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val sliceBuilder = Slice.Builder(Uri.EMPTY, SliceSpec(SLICE_SPEC_TYPE, REVISION_ID))"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val sliceBuilder = Slice.Builder(Uri.EMPTY, SliceSpec(SLICE_SPEC_TYPE, REVISION_ID))"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            val sliceBuilder = Slice.Builder(Uri.EMPTY, SliceSpec(SLICE_SPEC_TYPE, REVISION_ID))"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            sliceBuilder.addAction("
-        errorLine2="                         ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            sliceBuilder.addAction("
-        errorLine2="                         ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                Slice.Builder(sliceBuilder)"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                Slice.Builder(sliceBuilder)"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .addHints(Collections.singletonList(SLICE_HINT_PENDING_INTENT))"
-        errorLine2="                     ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .addHints(Collections.singletonList(SLICE_HINT_PENDING_INTENT))"
-        errorLine2="                     ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .build(), /*subType=*/null"
-        errorLine2="                     ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    .build(), /*subType=*/null"
-        errorLine2="                     ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return sliceBuilder.build()"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return sliceBuilder.build()"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            slice.items.forEach {"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            slice.items.forEach {"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (it.hasHint(SLICE_HINT_PENDING_INTENT)) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (it.hasHint(SLICE_HINT_PENDING_INTENT)) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    pendingIntent = it.action"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.credentials.provider.RemoteEntry.Companion is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    pendingIntent = it.action"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/credentials/provider/RemoteEntry.kt"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="UsesNonDefaultVisibleForTesting"
diff --git a/development/update_studio.sh b/development/update_studio.sh
index b1c814e..a17838f 100755
--- a/development/update_studio.sh
+++ b/development/update_studio.sh
@@ -7,8 +7,8 @@
 
 # Versions that the user should update when running this script
 echo Getting Studio version and link
-AGP_VERSION=${1:-8.6.0-alpha07}
-STUDIO_VERSION_STRING=${2:-"Android Studio Koala Feature Drop | 2024.1.2 Canary 7"}
+AGP_VERSION=${1:-8.6.0-beta01}
+STUDIO_VERSION_STRING=${2:-"Android Studio Koala Feature Drop | 2024.1.2 Beta 1"}
 
 # Get studio version number from version name
 STUDIO_IFRAME_LINK=`curl "https://developer.android.com/studio/archive.html" | grep "<iframe " | sed "s/.* src=\"\([^\"]*\)\".*/\1/g"`
diff --git a/dynamicanimation/dynamicanimation/lint-baseline.xml b/dynamicanimation/dynamicanimation/lint-baseline.xml
index e438e8b..9d5c665 100644
--- a/dynamicanimation/dynamicanimation/lint-baseline.xml
+++ b/dynamicanimation/dynamicanimation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -11,24 +11,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 33; however, the containing class androidx.dynamicanimation.animation.AnimationHandler is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mDurationScale = ValueAnimator.getDurationScale();"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                property.setValue(object, value);"
-        errorLine2="                         ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"/>
-    </issue>
-
-    <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
         errorLine1="        float durationScale = getAnimationHandler().getDurationScale();"
diff --git a/glance/glance-appwidget-preview/lint-baseline.xml b/glance/glance-appwidget-preview/lint-baseline.xml
deleted file mode 100644
index 88ba6f5..0000000
--- a/glance/glance-appwidget-preview/lint-baseline.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="                .all { it }"
-        errorLine2="                 ~~~">
-        <location
-            file="src/main/java/androidx/glance/appwidget/preview/ComposableInvoker.kt"/>
-    </issue>
-
-</issues>
diff --git a/glance/glance-template/lint-baseline.xml b/glance/glance-template/lint-baseline.xml
deleted file mode 100644
index 8a73870..0000000
--- a/glance/glance-template/lint-baseline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        textList.forEachIndexed { index, item ->"
-        errorLine2="                 ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/template/GlanceAppWidgetTemplates.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            actionBlock.actionButtons.forEach { button ->"
-        errorLine2="                                      ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/template/GlanceAppWidgetTemplates.kt"/>
-    </issue>
-
-</issues>
diff --git a/glance/glance-testing/lint-baseline.xml b/glance/glance-testing/lint-baseline.xml
deleted file mode 100644
index 42fb306..0000000
--- a/glance/glance-testing/lint-baseline.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha06)" variant="all" version="8.5.0-alpha06">
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="    nodes.forEachIndexed { index, glanceNode ->"
-        errorLine2="          ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/testing/AssertionErrorMessages.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        children.forEach { child ->"
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/testing/unit/GlanceMappedNode.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        return mappedNodes.toList()"
-        errorLine2="                           ~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/testing/unit/GlanceMappedNode.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        val violations = filteredNodes.filter { !matcher.matches(it) }"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/testing/GlanceNodeAssertionCollection.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            this.allNodes = allNodes.toList()"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/testing/TestContext.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        return node.children().any { checkIfSubtreeMatchesRecursive(matcher, it) }"
-        errorLine2="                               ~~~">
-        <location
-            file="src/main/java/androidx/glance/testing/unit/UnitTestFilters.kt"/>
-    </issue>
-
-</issues>
diff --git a/glance/glance-wear-tiles/lint-baseline.xml b/glance/glance-wear-tiles/lint-baseline.xml
index 72becec..6106ce775 100644
--- a/glance/glance-wear-tiles/lint-baseline.xml
+++ b/glance/glance-wear-tiles/lint-baseline.xml
@@ -1,131 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha06)" variant="all" version="8.5.0-alpha06">
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="    return { curvedChildList.forEach { composable -> object : CurvedChildScope {}.composable() } }"
-        errorLine2="                             ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/curved/CurvedRow.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            it.children.addAll(children.map { it.copy() })"
-        errorLine2="                                        ~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/curved/CurvedRow.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            it.children.addAll(children.map { it.copy() })"
-        errorLine2="                                        ~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/curved/CurvedRow.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="    children.mapIndexed { index, child ->"
-        errorLine2="             ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/NormalizeCompositionTree.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="    toDelete.forEach { children.removeAt(it) }"
-        errorLine2="             ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/NormalizeCompositionTree.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            children.forEach { child ->"
-        errorLine2="                     ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/NormalizeCompositionTree.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="        textList.forEach { item ->"
-        errorLine2="                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/template/SingleEntityTemplateLayouts.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            .setContentDescription(it.joinToString())"
-        errorLine2="                                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/WearCompositionTranslator.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            .setContentDescription(it.joinToString())"
-        errorLine2="                                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/WearCompositionTranslator.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            element.children.forEach {"
-        errorLine2="                             ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/WearCompositionTranslator.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="                element.children.forEach {"
-        errorLine2="                                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/WearCompositionTranslator.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="                element.children.forEach {"
-        errorLine2="                                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/WearCompositionTranslator.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="    element.children.forEach { curvedChild ->"
-        errorLine2="                     ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/WearCompositionTranslator.kt"/>
-    </issue>
-
-    <issue
-        id="ListIterator"
-        message="Creating an unnecessary Iterator to iterate through a List"
-        errorLine1="            curvedChild.children.forEach {"
-        errorLine2="                                 ~~~~~~~">
-        <location
-            file="src/main/java/androidx/glance/wear/tiles/WearCompositionTranslator.kt"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9d52580..cb8c4a7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,13 +2,13 @@
 # -----------------------------------------------------------------------------
 # All of the following should be updated in sync.
 # -----------------------------------------------------------------------------
-androidGradlePlugin = "8.6.0-alpha07"
+androidGradlePlugin = "8.6.0-beta01"
 # NOTE: When updating the lint version we also need to update the `api` version
 # supported by `IssueRegistry`'s.' For e.g. r.android.com/1331903
-androidLint = "31.6.0-alpha07"
+androidLint = "31.6.0-beta01"
 # Once you have a chosen version of AGP to upgrade to, go to
 # https://developer.android.com/studio/archive and find the matching version of Studio.
-androidStudio = "2024.1.2.7"
+androidStudio = "2024.1.2.9"
 # -----------------------------------------------------------------------------
 
 androidLintMin = "31.1.0"
diff --git a/graphics/filters/filters/lint-baseline.xml b/graphics/filters/filters/lint-baseline.xml
index 7b4b9b9d..4ed9fd3 100644
--- a/graphics/filters/filters/lint-baseline.xml
+++ b/graphics/filters/filters/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="UnsafeOptInUsageError"
@@ -13,8 +13,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    Assertions.checkArgument("
-        errorLine2="               ~~~~~~~~~~~~~">
+        errorLine1="        Assertions.checkArgument("
+        errorLine2="                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/Vignette.kt"/>
     </issue>
@@ -22,8 +22,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    Assertions.checkArgument("
-        errorLine2="               ~~~~~~~~~~~~~">
+        errorLine1="        Assertions.checkArgument("
+        errorLine2="                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/Vignette.kt"/>
     </issue>
@@ -31,8 +31,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  @Throws(FrameProcessingException::class)"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    @Throws(FrameProcessingException::class)"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/Vignette.kt"/>
     </issue>
@@ -40,8 +40,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  override fun toGlTextureProcessor("
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    override fun toGlTextureProcessor("
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/Vignette.kt"/>
     </issue>
@@ -49,8 +49,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  ): SingleFrameGlTextureProcessor {"
-        errorLine2="     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    ): SingleFrameGlTextureProcessor {"
+        errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/Vignette.kt"/>
     </issue>
@@ -58,8 +58,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  SingleFrameGlTextureProcessor(useHdr) {"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    SingleFrameGlTextureProcessor(useHdr) {"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -67,8 +67,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  SingleFrameGlTextureProcessor(useHdr) {"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    SingleFrameGlTextureProcessor(useHdr) {"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -76,8 +76,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  private var glProgram: GlProgram? = null"
-        errorLine2="                         ~~~~~~~~~~">
+        errorLine1="    private var glProgram: GlProgram? = null"
+        errorLine2="                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -85,8 +85,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="        GlProgram(context!!, VERTEX_SHADER_PATH, FRAGMENT_SHADER_PATH)"
-        errorLine2="        ~~~~~~~~~">
+        errorLine1="                GlProgram(context!!, VERTEX_SHADER_PATH, FRAGMENT_SHADER_PATH)"
+        errorLine2="                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -94,8 +94,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="        throw FrameProcessingException(e)"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                throw FrameProcessingException(e)"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -103,8 +103,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      } catch (e: GlUtil.GlException) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~">
+        errorLine1="            } catch (e: GlUtil.GlException) {"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -112,8 +112,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="        throw FrameProcessingException(e)"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                throw FrameProcessingException(e)"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -121,8 +121,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    glProgram!!.setBufferAttribute("
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        errorLine1="        glProgram!!.setBufferAttribute("
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -130,8 +130,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      GlUtil.getNormalizedCoordinateBounds(),"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            GlUtil.getNormalizedCoordinateBounds(),"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -139,8 +139,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      GlUtil.HOMOGENEOUS_COORDINATE_VECTOR_SIZE"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            GlUtil.HOMOGENEOUS_COORDINATE_VECTOR_SIZE"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -148,8 +148,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    val identityMatrix = GlUtil.create4x4IdentityMatrix()"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="        val identityMatrix = GlUtil.create4x4IdentityMatrix()"
+        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -157,8 +157,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    glProgram!!.setFloatsUniform(&quot;uTransformationMatrix&quot;, identityMatrix)"
-        errorLine2="                ~~~~~~~~~~~~~~~~">
+        errorLine1="        glProgram!!.setFloatsUniform(&quot;uTransformationMatrix&quot;, identityMatrix)"
+        errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -166,8 +166,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    glProgram!!.setFloatsUniform(&quot;uTexTransformationMatrix&quot;, identityMatrix)"
-        errorLine2="                ~~~~~~~~~~~~~~~~">
+        errorLine1="        glProgram!!.setFloatsUniform(&quot;uTexTransformationMatrix&quot;, identityMatrix)"
+        errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -175,8 +175,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  override fun configure(inputWidth: Int, inputHeight: Int): Pair&lt;Int, Int> {"
-        errorLine2="               ~~~~~~~~~">
+        errorLine1="    override fun configure(inputWidth: Int, inputHeight: Int): Pair&lt;Int, Int> {"
+        errorLine2="                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -184,8 +184,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  @Throws(FrameProcessingException::class)"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    @Throws(FrameProcessingException::class)"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -193,8 +193,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  override fun drawFrame(inputTexId: Int, presentationTimeUs: Long) {"
-        errorLine2="               ~~~~~~~~~">
+        errorLine1="    override fun drawFrame(inputTexId: Int, presentationTimeUs: Long) {"
+        errorLine2="                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -202,8 +202,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.use()"
-        errorLine2="                  ~~~">
+        errorLine1="            glProgram!!.use()"
+        errorLine2="                        ~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -211,8 +211,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.setFloatUniform(&quot;uAspectRatio&quot;, this.aspectRatio)"
-        errorLine2="                  ~~~~~~~~~~~~~~~">
+        errorLine1="            glProgram!!.setFloatUniform(&quot;uAspectRatio&quot;, this.aspectRatio)"
+        errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -220,8 +220,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.setFloatUniform(&quot;uInnerRadius&quot;, this.vignetteEffect.innerRadius)"
-        errorLine2="                  ~~~~~~~~~~~~~~~">
+        errorLine1="            glProgram!!.setFloatUniform(&quot;uInnerRadius&quot;, this.vignetteEffect.innerRadius)"
+        errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -229,8 +229,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.setFloatUniform(&quot;uOuterRadius&quot;, this.vignetteEffect.outerRadius)"
-        errorLine2="                  ~~~~~~~~~~~~~~~">
+        errorLine1="            glProgram!!.setFloatUniform(&quot;uOuterRadius&quot;, this.vignetteEffect.outerRadius)"
+        errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -238,8 +238,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.setIntUniform(&quot;uShouldVignetteAlpha&quot;,"
-        errorLine2="                  ~~~~~~~~~~~~~">
+        errorLine1="            glProgram!!.setIntUniform(&quot;uShouldVignetteAlpha&quot;, if (shouldVignetteAlpha) 1 else 0)"
+        errorLine2="                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -247,8 +247,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.setIntUniform(&quot;uShouldVignetteColor&quot;,"
-        errorLine2="                  ~~~~~~~~~~~~~">
+        errorLine1="            glProgram!!.setIntUniform(&quot;uShouldVignetteColor&quot;, if (shouldVignetteColor) 1 else 0)"
+        errorLine2="                        ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -256,8 +256,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.setSamplerTexIdUniform(&quot;uTexSampler&quot;, inputTexId, /* texUnitIndex= */ 0)"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            glProgram!!.setSamplerTexIdUniform(&quot;uTexSampler&quot;, inputTexId, /* texUnitIndex= */ 0)"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -265,8 +265,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.bindAttributesAndUniforms()"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            glProgram!!.bindAttributesAndUniforms()"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -274,8 +274,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    } catch (e: GlUtil.GlException) {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        errorLine1="        } catch (e: GlUtil.GlException) {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -283,8 +283,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      throw FrameProcessingException(e, presentationTimeUs)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            throw FrameProcessingException(e, presentationTimeUs)"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -292,8 +292,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  @Throws(FrameProcessingException::class)"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    @Throws(FrameProcessingException::class)"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -301,8 +301,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="  override fun release() {"
-        errorLine2="               ~~~~~~~">
+        errorLine1="    override fun release() {"
+        errorLine2="                 ~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -310,8 +310,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    super.release()"
-        errorLine2="          ~~~~~~~">
+        errorLine1="        super.release()"
+        errorLine2="              ~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -319,8 +319,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      glProgram!!.delete()"
-        errorLine2="                  ~~~~~~">
+        errorLine1="            glProgram!!.delete()"
+        errorLine2="                        ~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -328,8 +328,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="    } catch (e: GlUtil.GlException) {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        errorLine1="        } catch (e: GlUtil.GlException) {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
@@ -337,8 +337,8 @@
     <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.media3.common.util.UnstableApi` or `@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)`"
-        errorLine1="      throw FrameProcessingException(e)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            throw FrameProcessingException(e)"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/graphics/filters/VignetteProcessor.kt"/>
     </issue>
diff --git a/inspection/inspection-gradle-plugin/lint-baseline.xml b/inspection/inspection-gradle-plugin/lint-baseline.xml
index cae3d85..603e7bd 100644
--- a/inspection/inspection-gradle-plugin/lint-baseline.xml
+++ b/inspection/inspection-gradle-plugin/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="EagerGradleConfiguration"
         message="Avoid using method get"
-        errorLine1="        it.jars.from(jar.get().archiveFile)"
-        errorLine2="                         ~~~">
+        errorLine1="            it.jars.from(jar.get().archiveFile)"
+        errorLine2="                             ~~~">
         <location
             file="src/main/kotlin/androidx/inspection/gradle/DexInspectorTask.kt"/>
     </issue>
@@ -40,8 +40,8 @@
     <issue
         id="WithPluginClasspathUsage"
         message="Avoid usage of GradleRunner#withPluginClasspath, which is broken. Instead use something like https://github.com/autonomousapps/dependency-analysis-gradle-plugin/tree/main/testkit#gradle-testkit-support-plugin"
-        errorLine1="            .withPluginClasspath()"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            GradleRunner.create().withProjectDir(projectSetup.rootDir).withPluginClasspath()"
+        errorLine2="                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/test/kotlin/androidx/inspection/gradle/InspectionPluginTest.kt"/>
     </issue>
diff --git a/leanback/leanback/lint-baseline.xml b/leanback/leanback/lint-baseline.xml
index 32fe49d..26ee15a 100644
--- a/leanback/leanback/lint-baseline.xml
+++ b/leanback/leanback/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -1325,33 +1325,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.leanback.widget.ForegroundHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return view.getForeground();"
-        errorLine2="                        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/leanback/widget/ForegroundHelper.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.leanback.widget.ForegroundHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            view.setForeground(drawable);"
-        errorLine2="                 ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/leanback/widget/ForegroundHelper.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.leanback.app.PermissionHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            fragment.requestPermissions(permissions, requestCode);"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/leanback/app/PermissionHelper.java"/>
-    </issue>
-
-    <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class is missing private constructor"
         errorLine1="public class FocusHighlightHelper {"
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml b/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
index d1cab9b..89aacd2 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
+++ b/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) Size::class.java"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/SavedStateHandle.kt"/>
     </issue>
@@ -13,8 +13,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) SizeF::class.java"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/SavedStateHandle.kt"/>
     </issue>
diff --git a/lint-checks/integration-tests/lint-baseline.xml b/lint-checks/integration-tests/lint-baseline.xml
index f0e1d46..d566222 100644
--- a/lint-checks/integration-tests/lint-baseline.xml
+++ b/lint-checks/integration-tests/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="MissingClass"
@@ -31,7 +31,7 @@
     <issue
         id="BanKeepAnnotation"
         message="Uses @Keep annotation"
-        errorLine1="@Keep"
+        errorLine1="@Keep class KeepAnnotationUsageKotlin"
         errorLine2="~~~~~">
         <location
             file="src/main/java/androidx/KeepAnnotationUsageKotlin.kt"/>
@@ -85,7 +85,7 @@
     <issue
         id="BanTargetApiAnnotation"
         message="Use `@RequiresApi` instead of `@TargetApi`"
-        errorLine1="    @TargetApi(30)"
+        errorLine1="    @TargetApi(30) fun someMethod() {}"
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/TargetApiUsageKotlin.kt"/>
@@ -139,157 +139,13 @@
     <issue
         id="BanUncheckedReflection"
         message="Method.invoke requires both an upper and lower SDK bounds checks to be safe, and the upper bound must be below SdkVersionInfo.HIGHEST_KNOWN_API."
-        errorLine1="                        performStopActivity2ParamsMethod!!.invoke("
-        errorLine2="                        ^">
+        errorLine1="                        performStopActivity2ParamsMethod!!.invoke(activityThread, token, false)"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/sample/core/app/ActivityRecreatorKt.kt"/>
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 27; however, the containing class androidx.AutofixOnUnsafeCallWithImplicitVarArgsCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        adapter.setAutofillOptions();"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixOnUnsafeCallWithImplicitVarArgsCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 27; however, the containing class androidx.AutofixOnUnsafeCallWithImplicitVarArgsCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        adapter.setAutofillOptions(vararg);"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixOnUnsafeCallWithImplicitVarArgsCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 27; however, the containing class androidx.AutofixOnUnsafeCallWithImplicitVarArgsCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        adapter.setAutofillOptions(vararg1, vararg2, vararg3);"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixOnUnsafeCallWithImplicitVarArgsCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.AutofixUnsafeCallOnCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            ((DisplayCutout) secretDisplayCutout).getSafeInsetTop();"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallOnCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.AutofixUnsafeCallWithImplicitReturnCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return new AdaptiveIconDrawable(null, null);"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallWithImplicitReturnCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.AutofixUnsafeCallWithImplicitReturnCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return new AdaptiveIconDrawable(null, null);"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallWithImplicitReturnCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.AutofixUnsafeCallWithImplicitReturnCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return Icon.createWithAdaptiveBitmap(null);"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallWithImplicitReturnCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.AutofixUnsafeCallWithImplicitReturnCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return Icon.createWithAdaptiveBitmap(null);"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallWithImplicitReturnCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.AutofixUnsafeCallWithImplicitReturnCast is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        useStyle(new Notification.DecoratedCustomViewStyle());"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallWithImplicitReturnCast.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.AutofixUnsafeConstructorQualifiedClass is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return new Notification.DecoratedCustomViewStyle();"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeConstructorQualifiedClass.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 30; however, the containing class androidx.AutofixUnsafeConstructorReferenceJava is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            AccessibilityNodeInfo node = new AccessibilityNodeInfo(new View(context), 1);"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeConstructorReferenceJava.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.AutofixUnsafeGenericMethodReferenceJava is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getSystemService(serviceClass);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeGenericMethodReferenceJava.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.ClassVerificationFailureFromJava is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return view.getAccessibilityClassName();"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/ClassVerificationFailureFromJava.java"/>
-    </issue>
-
-    <issue
-        id="ImplicitCastClassVerificationFailure"
-        message="This expression has type android.app.Notification.CarExtender (introduced in API level 23) but it used as type android.app.Notification.Extender (introduced in API level 20). Run-time class verification will not be able to validate this implicit cast on devices between these API levels."
-        errorLine1="        builder.extend(extender);"
-        errorLine2="                       ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallWithImplicitParamCast.java"/>
-    </issue>
-
-    <issue
-        id="ImplicitCastClassVerificationFailure"
-        message="This expression has type android.graphics.drawable.AdaptiveIconDrawable (introduced in API level 26) but it used as type android.graphics.drawable.Drawable (introduced in API level 1). Run-time class verification will not be able to validate this implicit cast on devices between these API levels."
-        errorLine1="        return new AdaptiveIconDrawable(null, null);"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallWithImplicitReturnCast.java"/>
-    </issue>
-
-    <issue
-        id="ImplicitCastClassVerificationFailure"
-        message="This expression has type android.app.Notification.DecoratedCustomViewStyle (introduced in API level 24) but it used as type android.app.Notification.Style (introduced in API level 16). Run-time class verification will not be able to validate this implicit cast on devices between these API levels."
-        errorLine1="        useStyle(new Notification.DecoratedCustomViewStyle());"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/AutofixUnsafeCallWithImplicitReturnCast.java"/>
-    </issue>
-
-    <issue
         id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 24 (ActivityRecreatorChecked)"
         errorLine1="                    Log.e(LOG_TAG, &quot;Exception while invoking performStopActivity&quot;, t);"
@@ -310,8 +166,8 @@
     <issue
         id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 24 (ActivityRecreatorChecked)"
-        errorLine1="                        LOG_TAG,"
-        errorLine2="                        ~~~~~~~">
+        errorLine1="                    Log.e(LOG_TAG, &quot;Exception while invoking performStopActivity&quot;, t)"
+        errorLine2="                          ~~~~~~~">
         <location
             file="src/main/java/androidx/sample/core/app/ActivityRecreatorKtChecked.kt"/>
     </issue>
@@ -382,7 +238,7 @@
     <issue
         id="UsesNonDefaultVisibleForTesting"
         message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)"
+        errorLine1="    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) fun testMethodPrivate() {}"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/VisibleForTestingUsageKotlin.kt"/>
@@ -400,7 +256,7 @@
     <issue
         id="UsesNonDefaultVisibleForTesting"
         message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="    @VisibleForTesting(VisibleForTesting.PRIVATE)"
+        errorLine1="    @VisibleForTesting(VisibleForTesting.PRIVATE) fun testMethodValuePrivate() {}"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/VisibleForTestingUsageKotlin.kt"/>
@@ -418,7 +274,7 @@
     <issue
         id="UsesNonDefaultVisibleForTesting"
         message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="    @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)"
+        errorLine1="    @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) fun testMethodProtected() {}"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/VisibleForTestingUsageKotlin.kt"/>
@@ -427,7 +283,7 @@
     <issue
         id="UsesNonDefaultVisibleForTesting"
         message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="    @VisibleForTesting(otherwise = VisibleForTesting.NONE)"
+        errorLine1="    @VisibleForTesting(otherwise = VisibleForTesting.NONE) fun testMethodPackageNone() {}"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/VisibleForTestingUsageKotlin.kt"/>
@@ -436,7 +292,7 @@
     <issue
         id="UsesNonDefaultVisibleForTesting"
         message="Found non-default `otherwise` value for @VisibleForTesting"
-        errorLine1="    @get:VisibleForTesting(NONE)"
+        errorLine1="    @get:VisibleForTesting(NONE) val testPropertyGet = &quot;test&quot;"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/VisibleForTestingUsageKotlin.kt"/>
@@ -490,7 +346,7 @@
     <issue
         id="UsesRestrictToTestsScope"
         message="Replace `@RestrictTo(TESTS)` with `@VisibleForTesting`"
-        errorLine1="    @RestrictTo(RestrictTo.Scope.TESTS)"
+        errorLine1="    @RestrictTo(RestrictTo.Scope.TESTS) fun testMethod() {}"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/RestrictToTestsAnnotationUsageKotlin.kt"/>
@@ -499,7 +355,7 @@
     <issue
         id="UsesRestrictToTestsScope"
         message="Replace `@RestrictTo(TESTS)` with `@VisibleForTesting`"
-        errorLine1="    @RestrictTo(RestrictTo.Scope.TESTS, RestrictTo.Scope.LIBRARY)"
+        errorLine1="    @RestrictTo(RestrictTo.Scope.TESTS, RestrictTo.Scope.LIBRARY) fun testMethodVarArg() {}"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/RestrictToTestsAnnotationUsageKotlin.kt"/>
@@ -508,7 +364,7 @@
     <issue
         id="UsesRestrictToTestsScope"
         message="Replace `@RestrictTo(TESTS)` with `@VisibleForTesting`"
-        errorLine1="    @get:RestrictTo(RestrictTo.Scope.TESTS)"
+        errorLine1="    @get:RestrictTo(RestrictTo.Scope.TESTS) val testPropertyGet = &quot;test&quot;"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/RestrictToTestsAnnotationUsageKotlin.kt"/>
@@ -679,8 +535,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 19"
-        errorLine1="     @RequiresApi(19)"
-        errorLine2="     ~~~~~~~~~~~~~~~~">
+        errorLine1="    @RequiresApi(19)"
+        errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/RequiresApiKotlin.kt"/>
     </issue>
diff --git a/mediarouter/mediarouter/lint-baseline.xml b/mediarouter/mediarouter/lint-baseline.xml
index 315dbc1..44dd466 100644
--- a/mediarouter/mediarouter/lint-baseline.xml
+++ b/mediarouter/mediarouter/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha06)" variant="all" version="8.5.0-alpha06">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -29,24 +29,6 @@
     </issue>
 
     <issue
-        id="IllegalExperimentalApiUsage"
-        message="`Experimental` and `RequiresOptIn` APIs may only be used within the same-version group where they were defined."
-        errorLine1="    @OptIn(markerClass = androidx.core.os.BuildCompat.PrereleaseSdkCheck.class)"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java"/>
-    </issue>
-
-    <issue
-        id="IllegalExperimentalApiUsage"
-        message="`Experimental` and `RequiresOptIn` APIs may only be used within the same-version group where they were defined."
-        errorLine1="    @OptIn(markerClass = androidx.core.os.BuildCompat.PrereleaseSdkCheck.class)"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java"/>
-    </issue>
-
-    <issue
         id="MissingTestSizeAnnotation"
         message="Missing test size annotation"
         errorLine1="    public void testReset() {"
@@ -73,13 +55,4 @@
             file="src/main/java/androidx/mediarouter/app/DeviceUtils.java"/>
     </issue>
 
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="                if (what == CLIENT_MSG_REGISTER &amp;&amp; Build.VERSION.SDK_INT"
-        errorLine2="                                                   ^">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"/>
-    </issue>
-
 </issues>
diff --git a/navigation/integration-tests/testapp/lint-baseline.xml b/navigation/integration-tests/testapp/lint-baseline.xml
index b1b8eb9..ef3607d 100644
--- a/navigation/integration-tests/testapp/lint-baseline.xml
+++ b/navigation/integration-tests/testapp/lint-baseline.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.navigation.testapp.AndroidFragment is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                notificationManager.createNotificationChannel("
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/navigation/testapp/AndroidFragment.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.navigation.testapp.AndroidFragment is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    NotificationChannel("
-        errorLine2="                    ^">
-        <location
-            file="src/main/java/androidx/navigation/testapp/AndroidFragment.kt"/>
-    </issue>
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ObsoleteSdkInt"
diff --git a/navigation/navigation-benchmark/lint-baseline.xml b/navigation/navigation-benchmark/lint-baseline.xml
index a59f98e..bb41c27 100644
--- a/navigation/navigation-benchmark/lint-baseline.xml
+++ b/navigation/navigation-benchmark/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-alpha05)" variant="all" version="8.0.0-alpha05">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="MissingTestSizeAnnotation"
         message="Missing test size annotation"
-        errorLine1="    fun navGraphDestinations_withRoutes() = inflateNavGraph_withRoutes(1)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    @Test fun navGraphDestinations_withRoutes() = inflateNavGraph_withRoutes(1)"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidTest/java/androidx/navigation/NavDeepLinkBenchmark.kt"/>
     </issue>
@@ -13,8 +13,8 @@
     <issue
         id="MissingTestSizeAnnotation"
         message="Missing test size annotation"
-        errorLine1="    fun navGraphDestinations_withRoutes10() = inflateNavGraph_withRoutes(10)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    @Test fun navGraphDestinations_withRoutes10() = inflateNavGraph_withRoutes(10)"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidTest/java/androidx/navigation/NavDeepLinkBenchmark.kt"/>
     </issue>
@@ -22,8 +22,8 @@
     <issue
         id="MissingTestSizeAnnotation"
         message="Missing test size annotation"
-        errorLine1="    fun navGraphDestinations_withRoutes50() = inflateNavGraph_withRoutes(50)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    @Test fun navGraphDestinations_withRoutes50() = inflateNavGraph_withRoutes(50)"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidTest/java/androidx/navigation/NavDeepLinkBenchmark.kt"/>
     </issue>
@@ -31,8 +31,8 @@
     <issue
         id="MissingTestSizeAnnotation"
         message="Missing test size annotation"
-        errorLine1="    fun navGraphDestinations_withRoutes100() = inflateNavGraph_withRoutes(100)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    @Test fun navGraphDestinations_withRoutes100() = inflateNavGraph_withRoutes(100)"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidTest/java/androidx/navigation/NavDeepLinkBenchmark.kt"/>
     </issue>
diff --git a/navigation/navigation-safe-args-gradle-plugin/lint-baseline.xml b/navigation/navigation-safe-args-gradle-plugin/lint-baseline.xml
index ac0c4e5..530d8a9 100644
--- a/navigation/navigation-safe-args-gradle-plugin/lint-baseline.xml
+++ b/navigation/navigation-safe-args-gradle-plugin/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -58,8 +58,8 @@
     <issue
         id="GradleProjectIsolation"
         message="Use providers.gradleProperty instead of findProperty"
-        errorLine1="                    (project.findProperty(&quot;android.useAndroidX&quot;) == &quot;true&quot;).also {"
-        errorLine2="                             ~~~~~~~~~~~~">
+        errorLine1="                        (project.findProperty(&quot;android.useAndroidX&quot;) == &quot;true&quot;).also {"
+        errorLine2="                                 ~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/androidx/navigation/safeargs/gradle/SafeArgsPlugin.kt"/>
     </issue>
@@ -67,8 +67,8 @@
     <issue
         id="WithPluginClasspathUsage"
         message="Avoid usage of GradleRunner#withPluginClasspath, which is broken. Instead use something like https://github.com/autonomousapps/dependency-analysis-gradle-plugin/tree/main/testkit#gradle-testkit-support-plugin"
-        errorLine1="        .withProjectDir(projectRoot()).withPluginClasspath()"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            .withPluginClasspath()"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/test/kotlin/androidx/navigation/safeargs/gradle/BasePluginTest.kt"/>
     </issue>
diff --git a/privacysandbox/ads/ads-adservices-java/lint-baseline.xml b/privacysandbox/ads/ads-adservices-java/lint-baseline.xml
index afd6f01..06846f2 100644
--- a/privacysandbox/ads/ads-adservices-java/lint-baseline.xml
+++ b/privacysandbox/ads/ads-adservices-java/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -28,13 +28,4 @@
             file="src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/topics/TopicsManagerTest.java"/>
     </issue>
 
-    <issue
-        id="BanThreadSleep"
-        message="Uses Thread.sleep()"
-        errorLine1="        Thread.sleep(TEST_EPOCH_JOB_PERIOD_MS);"
-        errorLine2="               ~~~~~">
-        <location
-            file="src/androidTest/java/androidx/privacysandbox/ads/adservices/java/endtoend/topics/TopicsManagerTest.java"/>
-    </issue>
-
 </issues>
diff --git a/privacysandbox/ads/ads-adservices/lint-baseline.xml b/privacysandbox/ads/ads-adservices/lint-baseline.xml
deleted file mode 100644
index 872f5d8..0000000
--- a/privacysandbox/ads/ads-adservices/lint-baseline.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ads.adservices.topics.TopicsManagerImplCommon is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mTopicsManager.getTopics("
-        errorLine2="                       ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ads.adservices.topics.TopicsManagerImplCommon is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return android.adservices.topics.GetTopicsRequest.Builder()"
-        errorLine2="                                                          ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ads.adservices.topics.TopicsManagerImplCommon is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            .setAdsSdkName(request.adsSdkName)"
-        errorLine2="             ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ads.adservices.topics.TopicsManagerImplCommon is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            .build()"
-        errorLine2="             ~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ads.adservices.topics.TopicsManagerImplCommon is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        for (topic in response.topics) {"
-        errorLine2="                               ~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ads.adservices.topics.TopicsManagerImplCommon is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            topics.add(Topic(topic.taxonomyVersion, topic.modelVersion, topic.topicId))"
-        errorLine2="                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ads.adservices.topics.TopicsManagerImplCommon is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            topics.add(Topic(topic.taxonomyVersion, topic.modelVersion, topic.topicId))"
-        errorLine2="                                                          ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ads.adservices.topics.TopicsManagerImplCommon is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            topics.add(Topic(topic.taxonomyVersion, topic.modelVersion, topic.topicId))"
-        errorLine2="                                                                              ~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon.kt"/>
-    </issue>
-
-</issues>
diff --git a/privacysandbox/plugins/plugins-privacysandbox-library/lint-baseline.xml b/privacysandbox/plugins/plugins-privacysandbox-library/lint-baseline.xml
index 21096cd..e01b6e6 100644
--- a/privacysandbox/plugins/plugins-privacysandbox-library/lint-baseline.xml
+++ b/privacysandbox/plugins/plugins-privacysandbox-library/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha09" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha09)" variant="all" version="8.4.0-alpha09">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="WithPluginClasspathUsage"
         message="Avoid usage of GradleRunner#withPluginClasspath, which is broken. Instead use something like https://github.com/autonomousapps/dependency-analysis-gradle-plugin/tree/main/testkit#gradle-testkit-support-plugin"
-        errorLine1="            .withPluginClasspath()"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            GradleRunner.create().withProjectDir(projectSetup.rootDir).withPluginClasspath()"
+        errorLine2="                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/test/java/androidx/privacysandboxlibraryplugin/PrivacySandboxLibraryPluginTest.kt"/>
     </issue>
diff --git a/privacysandbox/ui/integration-tests/testsdkprovider/lint-baseline.xml b/privacysandbox/ui/integration-tests/testsdkprovider/lint-baseline.xml
deleted file mode 100644
index 264a6f3..0000000
--- a/privacysandbox/ui/integration-tests/testsdkprovider/lint-baseline.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ui.integration.testsdkprovider.SdkProviderImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="class SdkProviderImpl : SandboxedSdkProvider() {"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ui/integration/testsdkprovider/SdkProviderImpl.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ui.integration.testsdkprovider.SdkProviderImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return SandboxedSdk(SdkApi(context!!))"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ui/integration/testsdkprovider/SdkProviderImpl.kt"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.ui.integration.testsdkprovider.SdkProviderImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        return SandboxedSdk(SdkApi(context!!))"
-        errorLine2="                                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/privacysandbox/ui/integration/testsdkprovider/SdkProviderImpl.kt"/>
-    </issue>
-
-</issues>
diff --git a/room/integration-tests/kotlintestapp/lint-baseline.xml b/room/integration-tests/kotlintestapp/lint-baseline.xml
index 714f298..e0c18dc 100644
--- a/room/integration-tests/kotlintestapp/lint-baseline.xml
+++ b/room/integration-tests/kotlintestapp/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                Thread.sleep(3_500)"
-        errorLine2="                       ~~~~~">
+        errorLine1="                    Thread.sleep(3_500)"
+        errorLine2="                           ~~~~~">
         <location
             file="src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt"/>
     </issue>
@@ -13,8 +13,8 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                        .doOnSubscribe { Thread.sleep(500) }"
-        errorLine2="                                                ~~~~~">
+        errorLine1="                                .doOnSubscribe { Thread.sleep(500) }"
+        errorLine2="                                                        ~~~~~">
         <location
             file="src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx2PagingSourceTest.kt"/>
     </issue>
@@ -22,8 +22,8 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                        .doOnSubscribe { Thread.sleep(500) }"
-        errorLine2="                                                ~~~~~">
+        errorLine1="                                .doOnSubscribe { Thread.sleep(500) }"
+        errorLine2="                                                        ~~~~~">
         <location
             file="src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx2PagingSourceTest.kt"/>
     </issue>
@@ -31,8 +31,8 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                        .doOnSubscribe { Thread.sleep(500) }"
-        errorLine2="                                                ~~~~~">
+        errorLine1="                                .doOnSubscribe { Thread.sleep(500) }"
+        errorLine2="                                                        ~~~~~">
         <location
             file="src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx2PagingSourceTest.kt"/>
     </issue>
@@ -40,8 +40,8 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                        .doOnSubscribe { Thread.sleep(500) }"
-        errorLine2="                                                ~~~~~">
+        errorLine1="                                .doOnSubscribe { Thread.sleep(500) }"
+        errorLine2="                                                        ~~~~~">
         <location
             file="src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx3PagingSourceTest.kt"/>
     </issue>
@@ -49,8 +49,8 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                        .doOnSubscribe { Thread.sleep(500) }"
-        errorLine2="                                                ~~~~~">
+        errorLine1="                                .doOnSubscribe { Thread.sleep(500) }"
+        errorLine2="                                                        ~~~~~">
         <location
             file="src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx3PagingSourceTest.kt"/>
     </issue>
@@ -58,8 +58,8 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                        .doOnSubscribe { Thread.sleep(500) }"
-        errorLine2="                                                ~~~~~">
+        errorLine1="                                .doOnSubscribe { Thread.sleep(500) }"
+        errorLine2="                                                        ~~~~~">
         <location
             file="src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx3PagingSourceTest.kt"/>
     </issue>
diff --git a/room/integration-tests/testapp/lint-baseline.xml b/room/integration-tests/testapp/lint-baseline.xml
index 2daddb0..c60daab 100644
--- a/room/integration-tests/testapp/lint-baseline.xml
+++ b/room/integration-tests/testapp/lint-baseline.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0-alpha07" type="baseline" client="gradle" dependencies="false"
-    name="AGP (8.6.0-alpha07)" variant="all" version="8.6.0-alpha07">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -101,11 +100,13 @@
             file="src/androidTest/java/androidx/room/integration/testapp/test/InvalidationTrackerBehavioralTest.java"/>
     </issue>
 
-    <issue id="BanThreadSleep" message="Uses Thread.sleep()"
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
         errorLine1="                        Thread.sleep(200);"
         errorLine2="                               ~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/integration/testapp/test/MultiInstanceInvalidationTest.java" />
+            file="src/androidTest/java/androidx/room/integration/testapp/test/MultiInstanceInvalidationTest.java"/>
     </issue>
 
     <issue
@@ -189,20 +190,22 @@
             file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"/>
     </issue>
 
-    <issue id="UnknownNullness"
+    <issue
+        id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
         errorLine1="    boolean contains(int id, String name, String lastName);"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java" />
+            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"/>
     </issue>
 
-    <issue id="UnknownNullness"
+    <issue
+        id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
         errorLine1="    boolean contains(int id, String name, String lastName);"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java" />
+            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"/>
     </issue>
 
     <issue
diff --git a/room/room-gradle-plugin/lint-baseline.xml b/room/room-gradle-plugin/lint-baseline.xml
index c581b23..54b9dc9 100644
--- a/room/room-gradle-plugin/lint-baseline.xml
+++ b/room/room-gradle-plugin/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="WithPluginClasspathUsage"
         message="Avoid usage of GradleRunner#withPluginClasspath, which is broken. Instead use something like https://github.com/autonomousapps/dependency-analysis-gradle-plugin/tree/main/testkit#gradle-testkit-support-plugin"
-        errorLine1="        .withPluginClasspath()"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            .withPluginClasspath()"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/test/java/androidx/room/gradle/GradleTestUtils.kt"/>
     </issue>
@@ -13,7 +13,7 @@
     <issue
         id="WithTypeWithoutConfigureEach"
         message="Avoid passing a closure to withType, use withType().configureEach instead"
-        errorLine1="    ) = project.tasks.withType(JavaCompile::class.java) { task ->"
+        errorLine1="        project.tasks.withType(JavaCompile::class.java) { task ->"
         errorLine2="                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/gradle/integration/AndroidPluginIntegration.kt"/>
@@ -22,8 +22,8 @@
     <issue
         id="WithTypeWithoutConfigureEach"
         message="Avoid passing a closure to withType, use withType().configureEach instead"
-        errorLine1="        project.tasks.withType(KaptTask::class.java) { task ->"
-        errorLine2="                      ~~~~~~~~">
+        errorLine1="            project.tasks.withType(KaptTask::class.java) { task ->"
+        errorLine2="                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/gradle/integration/AndroidPluginIntegration.kt"/>
     </issue>
@@ -31,8 +31,8 @@
     <issue
         id="WithTypeWithoutConfigureEach"
         message="Avoid passing a closure to withType, use withType().configureEach instead"
-        errorLine1="        project.tasks.withType(KspTaskJvm::class.java) { task ->"
-        errorLine2="                      ~~~~~~~~">
+        errorLine1="            project.tasks.withType(KspTaskJvm::class.java) { task ->"
+        errorLine2="                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/gradle/integration/AndroidPluginIntegration.kt"/>
     </issue>
@@ -40,8 +40,8 @@
     <issue
         id="WithTypeWithoutConfigureEach"
         message="Avoid passing a closure to withType, use withType().configureEach instead"
-        errorLine1="        project.tasks.withType(KspTask::class.java) { task ->"
-        errorLine2="                      ~~~~~~~~">
+        errorLine1="            project.tasks.withType(KspTask::class.java) { task ->"
+        errorLine2="                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/gradle/integration/KotlinMultiplatformPluginIntegration.kt"/>
     </issue>
diff --git a/room/room-paging-rxjava2/lint-baseline.xml b/room/room-paging-rxjava2/lint-baseline.xml
index 884f439..97d2ed9 100644
--- a/room/room-paging-rxjava2/lint-baseline.xml
+++ b/room/room-paging-rxjava2/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-beta03" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-beta03)" variant="all" version="8.0.0-beta03">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                .doOnSubscribe { Thread.sleep(300) } // subscribe but delay the load"
-        errorLine2="                                        ~~~~~">
+        errorLine1="                    .doOnSubscribe { Thread.sleep(300) } // subscribe but delay the load"
+        errorLine2="                                            ~~~~~">
         <location
             file="src/androidTest/kotlin/androidx/room/paging/rxjava2/LimitOffsetRxPagingSourceTest.kt"/>
     </issue>
diff --git a/room/room-paging-rxjava3/lint-baseline.xml b/room/room-paging-rxjava3/lint-baseline.xml
index b44321d..7aaf6d8 100644
--- a/room/room-paging-rxjava3/lint-baseline.xml
+++ b/room/room-paging-rxjava3/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-beta03" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-beta03)" variant="all" version="8.0.0-beta03">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="                .doOnSubscribe { Thread.sleep(300) } // subscribe but delay the load"
-        errorLine2="                                        ~~~~~">
+        errorLine1="                    .doOnSubscribe { Thread.sleep(300) } // subscribe but delay the load"
+        errorLine2="                                            ~~~~~">
         <location
             file="src/androidTest/kotlin/androidx/room/paging/rxjava3/LimitOffsetRxPagingSourceTest.kt"/>
     </issue>
diff --git a/room/room-runtime/lint-baseline.xml b/room/room-runtime/lint-baseline.xml
index 814e6a9..a216f60 100644
--- a/room/room-runtime/lint-baseline.xml
+++ b/room/room-runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="RestrictedApiAndroidX"
@@ -85,7 +85,7 @@
     <issue
         id="RestrictedApiAndroidX"
         message="ProcessLock can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
-        errorLine1="        val copyLock = ProcessLock("
+        errorLine1="        val copyLock = ProcessLock(name, context.filesDir, processLevelLock)"
         errorLine2="                       ~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt"/>
@@ -94,8 +94,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="ProcessLock can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
-        errorLine1="            name,"
-        errorLine2="            ~~~~">
+        errorLine1="        val copyLock = ProcessLock(name, context.filesDir, processLevelLock)"
+        errorLine2="                                   ~~~~">
         <location
             file="src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt"/>
     </issue>
@@ -103,8 +103,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="ProcessLock can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
-        errorLine1="            context.filesDir,"
-        errorLine2="            ~~~~~~~~~~~~~~~~">
+        errorLine1="        val copyLock = ProcessLock(name, context.filesDir, processLevelLock)"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt"/>
     </issue>
@@ -130,8 +130,8 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                val supportsDeferForeignKeys = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP"
+        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/room/RoomDatabase.android.kt"/>
     </issue>
diff --git a/samples/AndroidXDemos/lint-baseline.xml b/samples/AndroidXDemos/lint-baseline.xml
index 5bcc968..d1ef1a6 100644
--- a/samples/AndroidXDemos/lint-baseline.xml
+++ b/samples/AndroidXDemos/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="OnClick"
@@ -158,24 +158,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 29; however, the containing class com.example.androidx.app.AppCompatDefaultNightModeBootAwareActivity is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        .detectImplicitDirectBoot()"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/androidx/app/AppCompatDefaultNightModeBootAwareActivity.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class com.example.androidx.widget.selection.fancy.FancySelectionDemoActivity.OnContextClickListener is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (view.showContextMenu(x, y)) {"
-        errorLine2="                     ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/androidx/widget/selection/fancy/FancySelectionDemoActivity.java"/>
-    </issue>
-
-    <issue
         id="NullabilityAnnotationsDetector"
         message="Use `@androidx.annotation.NonNull` instead of `@org.jetbrains.annotations.NotNull`"
         errorLine1="        @NotNull"
diff --git a/samples/Support4Demos/lint-baseline.xml b/samples/Support4Demos/lint-baseline.xml
index 3dba431..1375f16 100644
--- a/samples/Support4Demos/lint-baseline.xml
+++ b/samples/Support4Demos/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="MissingPermission"
@@ -110,33 +110,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class com.example.android.supportv4.media.MediaNotificationManager is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                notificationManager.createNotificationChannel("
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class com.example.android.supportv4.media.MediaNotificationManager is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        new NotificationChannel(NOTIFICATION_CHANNEL_ID, TAG,"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class com.example.android.supportv4.media.MediaNotificationManager is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                notificationManager.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
-    </issue>
-
-    <issue
         id="ForegroundServiceType"
         message="To call `Service.startForeground()`, the `&lt;service>` element of manifest file must have the `foregroundServiceType` attribute specified"
         errorLine1="                mService.startForeground(NOTIFICATION_ID, notification);"
diff --git a/samples/SupportLeanbackDemos/lint-baseline.xml b/samples/SupportLeanbackDemos/lint-baseline.xml
index 4921a8f..4a5c839 100644
--- a/samples/SupportLeanbackDemos/lint-baseline.xml
+++ b/samples/SupportLeanbackDemos/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="MissingSuperCall"
@@ -65,195 +65,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                        ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                                                      ~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (mPlayer.getPlaybackParams().getSpeed() != NORMAL_SPEED) {"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (mPlayer.getPlaybackParams().getSpeed() != NORMAL_SPEED) {"
-        errorLine2="                                            ~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                                              ~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                                              ~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                                              ~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class com.example.android.leanback.MediaSessionService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
-        errorLine2="                                                              ~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        getActivity().enterPictureInPictureMode();"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/PlaybackFragment.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        getActivity().enterPictureInPictureMode();"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/PlaybackSupportFragment.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        getActivity().enterPictureInPictureMode();"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/PlaybackTransportControlFragment.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        getActivity().enterPictureInPictureMode();"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/example/android/leanback/PlaybackTransportControlSupportFragment.java"/>
-    </issue>
-
-    <issue
         id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 32 (leanback.BrowseAnimationFragment)"
         errorLine1="        Log.i(TAG, &quot;onCreate&quot;);"
diff --git a/slice/slice-builders/lint-baseline.xml b/slice/slice-builders/lint-baseline.xml
index e6c36b0..468b4e7 100644
--- a/slice/slice-builders/lint-baseline.xml
+++ b/slice/slice-builders/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="WrongConstant"
@@ -11,24 +11,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.slice.builders.impl.ListBuilderBasicImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setTtl(ttl == null ? INFINITY : ttl.toMillis());"
-        errorLine2="                                            ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.slice.builders.impl.ListBuilderImpl is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setTtl(ttl == null ? INFINITY : ttl.toMillis());"
-        errorLine2="                                            ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"/>
-    </issue>
-
-    <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
         errorLine1="    @RequiresApi(21)"
diff --git a/slice/slice-view/lint-baseline.xml b/slice/slice-view/lint-baseline.xml
index 6f2e88b..48082e4 100644
--- a/slice/slice-view/lint-baseline.xml
+++ b/slice/slice-view/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanSynchronizedMethods"
@@ -11,15 +11,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.slice.widget.RemoteInputView.RemoteEditText is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                return isTemporarilyDetached();"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/widget/RemoteInputView.java"/>
-    </issue>
-
-    <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
         errorLine1="                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {"
diff --git a/sqlite/integration-tests/inspection-room-testapp/lint-baseline.xml b/sqlite/integration-tests/inspection-room-testapp/lint-baseline.xml
index ce89072..919b2bd 100644
--- a/sqlite/integration-tests/inspection-room-testapp/lint-baseline.xml
+++ b/sqlite/integration-tests/inspection-room-testapp/lint-baseline.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha08" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.0-alpha08)" variant="all" version="7.4.0-alpha08">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="MissingTestSizeAnnotation"
         message="Missing test size annotation"
-        errorLine1="    fun invalidationHook() = runBlocking&lt;Unit>(testJob) {"
+        errorLine1="    fun invalidationHook() ="
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="src/androidTest/java/androidx/sqlite/inspection/RoomInvalidationHookTest.kt"/>
diff --git a/stableaidl/stableaidl-gradle-plugin/lint-baseline.xml b/stableaidl/stableaidl-gradle-plugin/lint-baseline.xml
index 24cc85a..dadfd1a 100644
--- a/stableaidl/stableaidl-gradle-plugin/lint-baseline.xml
+++ b/stableaidl/stableaidl-gradle-plugin/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="InternalGradleApiUsage"
@@ -13,8 +13,8 @@
     <issue
         id="WithPluginClasspathUsage"
         message="Avoid usage of GradleRunner#withPluginClasspath, which is broken. Instead use something like https://github.com/autonomousapps/dependency-analysis-gradle-plugin/tree/main/testkit#gradle-testkit-support-plugin"
-        errorLine1="            .withPluginClasspath()"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            GradleRunner.create().withProjectDir(projectSetup.rootDir).withPluginClasspath()"
+        errorLine2="                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/test/java/androidx/stableaidl/StableAidlPluginTest.kt"/>
     </issue>
diff --git a/testutils/testutils-runtime/lint-baseline.xml b/testutils/testutils-runtime/lint-baseline.xml
index 1420667..129a1ee 100644
--- a/testutils/testutils-runtime/lint-baseline.xml
+++ b/testutils/testutils-runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -37,22 +37,4 @@
             file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"/>
     </issue>
 
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.testutils.LocaleTestUtils is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                newConfig.setLocales(locales.unwrap() as LocaleList)"
-        errorLine2="                          ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/testutils/LocaleTestUtils.kt"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 1, &quot;owner&quot;, in androidx.testutils.LifecycleOwnerUtils.waitUntilState) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            final @NonNull Lifecycle.State state) throws Throwable {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/testutils/LifecycleOwnerUtils.java"/>
-    </issue>
-
 </issues>
diff --git a/text/text/lint-baseline.xml b/text/text/lint-baseline.xml
index 2a6edab..e8e33e3 100644
--- a/text/text/lint-baseline.xml
+++ b/text/text/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha10" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha10)" variant="all" version="8.3.0-alpha10">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
@@ -40,8 +40,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable set with type TreeSet&lt;Integer>: replace with IntSet"
-        errorLine1="        val set = TreeSet&lt;Int>().apply {"
-        errorLine2="        ^">
+        errorLine1="        val set = TreeSet&lt;Int>().apply { words.fastForEach { add(it) } }"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.android.kt"/>
     </issue>
diff --git a/tracing/tracing-perfetto/lint-baseline.xml b/tracing/tracing-perfetto/lint-baseline.xml
index 42ea188..7aaa549 100644
--- a/tracing/tracing-perfetto/lint-baseline.xml
+++ b/tracing/tracing-perfetto/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="            Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP -> Build.SUPPORTED_ABIS.first()"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ->"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tracing/perfetto/security/SafeLibLoader.kt"/>
     </issue>
@@ -13,7 +13,7 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; SDK_INT is always >= 21"
-        errorLine1="        if (Build.VERSION.SDK_INT >= 21) Impl21.getCodeCacheDir(context)"
+        errorLine1="        if (Build.VERSION.SDK_INT >= 21) Impl21.getCodeCacheDir(context) else null"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tracing/perfetto/security/SafeLibLoader.kt"/>
diff --git a/tv/integration-tests/presentation/lint-baseline.xml b/tv/integration-tests/presentation/lint-baseline.xml
index 7b75ecb..f05a7c4 100644
--- a/tv/integration-tests/presentation/lint-baseline.xml
+++ b/tv/integration-tests/presentation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0-alpha03" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-alpha03)" variant="all" version="8.6.0-alpha03">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ModifierParameter"
@@ -11,15 +11,6 @@
     </issue>
 
     <issue
-        id="ModifierParameter"
-        message="Modifier parameter should be the first optional parameter"
-        errorLine1="    modifier: Modifier = Modifier,"
-        errorLine2="    ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tv/integration/presentation/ImageCard.kt"/>
-    </issue>
-
-    <issue
         id="UnnecessaryLambdaCreation"
         message="Creating an unnecessary lambda to emit a captured lambda"
         errorLine1="        content()"
diff --git a/tv/tv-foundation/lint-baseline.xml b/tv/tv-foundation/lint-baseline.xml
index a4b14b8..25a9c11 100644
--- a/tv/tv-foundation/lint-baseline.xml
+++ b/tv/tv-foundation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha09" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha09)" variant="all" version="8.4.0-alpha09">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -58,8 +58,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable pinnedItems with type List&lt;? extends Integer>: replace with IntList"
-        errorLine1="        val pinnedItems = itemProvider.calculateLazyLayoutPinnedIndices("
-        errorLine2="        ^">
+        errorLine1="            val pinnedItems ="
+        errorLine2="            ^">
         <location
             file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGrid.kt"/>
     </issue>
@@ -166,7 +166,7 @@
     <issue
         id="PrimitiveInCollection"
         message="field previousDefaultSpans with type List&lt;TvGridItemSpan>: replace with LongList"
-        errorLine1="    /**"
+        errorLine1="    /** List of 1x1 spans if we do not have custom spans. */"
         errorLine2="    ^">
         <location
             file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
@@ -202,8 +202,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable pinnedItems with type List&lt;? extends Integer>: replace with IntList"
-        errorLine1="        val pinnedItems = itemProvider.calculateLazyLayoutPinnedIndices("
-        errorLine2="        ^">
+        errorLine1="            val pinnedItems ="
+        errorLine2="            ^">
         <location
             file="src/main/java/androidx/tv/foundation/lazy/list/LazyList.kt"/>
     </issue>
diff --git a/tvprovider/tvprovider/lint-baseline.xml b/tvprovider/tvprovider/lint-baseline.xml
index 6bd4e3c..c3e7f1d 100644
--- a/tvprovider/tvprovider/lint-baseline.xml
+++ b/tvprovider/tvprovider/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
@@ -11,60 +11,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.tvprovider.media.tv.TvContractCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return TvContract.buildRecordedProgramUri(recordedProgramId);"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.tvprovider.media.tv.TvContractCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return TvContract.isChannelUri(uri);"
-        errorLine2="                              ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.tvprovider.media.tv.TvContractCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return TvContract.isChannelUriForTunerInput(uri);"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.tvprovider.media.tv.TvContractCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return TvContract.isChannelUriForPassthroughInput(uri);"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.tvprovider.media.tv.TvContractCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return TvContract.isProgramUri(uri);"
-        errorLine2="                              ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.tvprovider.media.tv.TvContractCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            TvContract.requestChannelBrowsable(context, channelId);"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
-    </issue>
-
-    <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class is missing private constructor"
         errorLine1="public class ChannelLogoUtils {"
diff --git a/wear/compose/compose-foundation/lint-baseline.xml b/wear/compose/compose-foundation/lint-baseline.xml
index 8d6d9c8..66b5aa3 100644
--- a/wear/compose/compose-foundation/lint-baseline.xml
+++ b/wear/compose/compose-foundation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha09" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha09)" variant="all" version="8.4.0-alpha09">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="ReturnFromAwaitPointerEventScope"
@@ -13,7 +13,7 @@
     <issue
         id="PrimitiveInCollection"
         message="variable weights with type List&lt;? extends Float>: replace with FloatList"
-        errorLine1="        val weights = childrenInLayoutOrder.fastMap { node ->"
+        errorLine1="        val weights ="
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/wear/compose/foundation/CurvedColumn.kt"/>
@@ -49,7 +49,7 @@
     <issue
         id="PrimitiveInCollection"
         message="variable weights with type List&lt;? extends Float>: replace with FloatList"
-        errorLine1="        val weights = childrenInLayoutOrder.fastMap { node ->"
+        errorLine1="        val weights ="
         errorLine2="        ^">
         <location
             file="src/main/java/androidx/wear/compose/foundation/CurvedRow.kt"/>
@@ -112,8 +112,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable previousAnchors with type Map&lt;T, ? extends Float>: replace with ObjectFloatMap"
-        errorLine1="        val previousAnchors = state.anchors"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                val previousAnchors = state.anchors"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
     </issue>
@@ -121,8 +121,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable newAnchors with type Map&lt;T, Float>: replace with ObjectFloatMap"
-        errorLine1="        val newAnchors = mutableMapOf&lt;T, Float>()"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                val newAnchors = mutableMapOf&lt;T, Float>()"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
     </issue>
@@ -184,7 +184,7 @@
     <issue
         id="PrimitiveInCollection"
         message="method closestAnchor has parameter $this$closestAnchor with type Map&lt;T, Float>: replace with ObjectFloatMap"
-        errorLine1="private fun &lt;T> Map&lt;T, Float>.closestAnchor("
+        errorLine1="private fun &lt;T> Map&lt;T, Float>.closestAnchor(offset: Float = 0f, searchUpwards: Boolean = false): T {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/compose/foundation/SwipeableV2.kt"/>
diff --git a/wear/compose/compose-material/lint-baseline.xml b/wear/compose/compose-material/lint-baseline.xml
index 65f4da2..71725ca 100644
--- a/wear/compose/compose-material/lint-baseline.xml
+++ b/wear/compose/compose-material/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="PrimitiveInCollection"
@@ -84,18 +84,18 @@
 
     <issue
         id="PrimitiveInCollection"
-        message="method processNewAnchors$compose_material has parameter oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        oldAnchors: Map&lt;Float, T>,"
-        errorLine2="                    ~~~~~~~~~~~~~">
+        message="method processNewAnchors$compose_material has parameter newAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
+        errorLine1="    internal suspend fun processNewAnchors(oldAnchors: Map&lt;Float, T>, newAnchors: Map&lt;Float, T>) {"
+        errorLine2="                                                                                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
     </issue>
 
     <issue
         id="PrimitiveInCollection"
-        message="method processNewAnchors$compose_material has parameter newAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        newAnchors: Map&lt;Float, T>"
-        errorLine2="                    ~~~~~~~~~~~~~">
+        message="method processNewAnchors$compose_material has parameter oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
+        errorLine1="    internal suspend fun processNewAnchors(oldAnchors: Map&lt;Float, T>, newAnchors: Map&lt;Float, T>) {"
+        errorLine2="                                                       ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
     </issue>
@@ -121,8 +121,8 @@
     <issue
         id="PrimitiveInCollection"
         message="variable oldAnchors with type Map&lt;Float, ? extends T>: replace with FloatObjectMap"
-        errorLine1="        val oldAnchors = state.anchors"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            val oldAnchors = state.anchors"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
     </issue>
@@ -130,8 +130,8 @@
     <issue
         id="PrimitiveInCollection"
         message="method findBounds has parameter anchors with type Set&lt;Float>: replace with FloatSet"
-        errorLine1="    anchors: Set&lt;Float>"
-        errorLine2="             ~~~~~~~~~~">
+        errorLine1="private fun findBounds(offset: Float, anchors: Set&lt;Float>): List&lt;Float> {"
+        errorLine2="                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
     </issue>
@@ -139,8 +139,8 @@
     <issue
         id="PrimitiveInCollection"
         message="return type List&lt;Float> of findBounds: replace with FloatList"
-        errorLine1="): List&lt;Float> {"
-        errorLine2="   ~~~~~~~~~~~">
+        errorLine1="private fun findBounds(offset: Float, anchors: Set&lt;Float>): List&lt;Float> {"
+        errorLine2="                                                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/compose/material/Swipeable.kt"/>
     </issue>
diff --git a/wear/compose/integration-tests/demos/lint-baseline.xml b/wear/compose/integration-tests/demos/lint-baseline.xml
index 467b911..8904ee5 100644
--- a/wear/compose/integration-tests/demos/lint-baseline.xml
+++ b/wear/compose/integration-tests/demos/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-beta01)" variant="all" version="8.3.0-beta01">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="WearStandaloneAppFlag"
@@ -40,7 +40,7 @@
     <issue
         id="PrimitiveInCollection"
         message="variable alignmentValues with type List&lt;? extends PositionIndicatorAlignment>: replace with IntList"
-        errorLine1="    val alignmentValues = listOf("
+        errorLine1="    val alignmentValues ="
         errorLine2="    ^">
         <location
             file="src/main/java/androidx/wear/compose/integration/demos/PositionIndicatorDemos.kt"/>
diff --git a/wear/protolayout/protolayout-material/lint-baseline.xml b/wear/protolayout/protolayout-material/lint-baseline.xml
index 4489b50..f36285f 100644
--- a/wear/protolayout/protolayout-material/lint-baseline.xml
+++ b/wear/protolayout/protolayout-material/lint-baseline.xml
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta02)" variant="all" version="8.1.0-beta02">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
-        errorLine1="            Thread.sleep(1000);"
-        errorLine2="                   ~~~~~">
-        <location
-            file="src/androidTest/java/androidx/wear/protolayout/material/RunnerUtils.java"/>
-    </issue>
-
-    <issue
-        id="BanThreadSleep"
-        message="Uses Thread.sleep()"
-        errorLine1="            Thread.sleep(1000);"
-        errorLine2="                   ~~~~~">
+        errorLine1="                Thread.sleep(100);"
+        errorLine2="                       ~~~~~">
         <location
             file="src/androidTest/java/androidx/wear/protolayout/material/RunnerUtils.java"/>
     </issue>
diff --git a/wear/tiles/tiles-renderer/lint-baseline.xml b/wear/tiles/tiles-renderer/lint-baseline.xml
index 2d98f2c..1395f3b 100644
--- a/wear/tiles/tiles-renderer/lint-baseline.xml
+++ b/wear/tiles/tiles-renderer/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha12" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha12)" variant="all" version="8.4.0-alpha12">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="UnspecifiedRegisterReceiverFlag"
@@ -13,8 +13,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Resources.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
-        errorLine1="                    res.toProto()"
-        errorLine2="                        ~~~~~~~">
+        errorLine1="                    androidx.wear.tiles.ResourceBuilders.Resources.fromProto(res.toProto())"
+        errorLine2="                                                                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/wear/tiles/connection/DefaultTileClient.kt"/>
     </issue>
@@ -40,8 +40,8 @@
     <issue
         id="RestrictedApiAndroidX"
         message="Resources.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
-        errorLine1="                            ResourceBuilders.Resources.fromProto(resources))"
-        errorLine2="                                                       ~~~~~~~~~">
+        errorLine1="                        continuation.resume(ResourceBuilders.Resources.fromProto(resources))"
+        errorLine2="                                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/tiles/connection/DefaultTileClient.kt"/>
     </issue>
diff --git a/wear/watchface/watchface-complications-data-source/lint-baseline.xml b/wear/watchface/watchface-complications-data-source/lint-baseline.xml
index 5edf002..0aede8c 100644
--- a/wear/watchface/watchface-complications-data-source/lint-baseline.xml
+++ b/wear/watchface/watchface-complications-data-source/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+<issues format="6" by="lint 8.6.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-beta01)" variant="all" version="8.6.0-beta01">
 
     <issue
         id="NewApi"
@@ -40,8 +40,8 @@
     <issue
         id="NewApi"
         message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
-        errorLine1="                        ?: TargetWatchFaceSafety.UNKNOWN"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                    ) ?: TargetWatchFaceSafety.UNKNOWN"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
     </issue>
@@ -58,8 +58,8 @@
     <issue
         id="NewApi"
         message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
-        errorLine1="                        ?: TargetWatchFaceSafety.UNKNOWN"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                    ) ?: TargetWatchFaceSafety.UNKNOWN"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
     </issue>