diff --git a/activity/activity-lint/src/test/java/androidx/activity/lint/ActivityResultFragmentVersionDetectorTest.kt b/activity/activity-lint/src/test/java/androidx/activity/lint/ActivityResultFragmentVersionDetectorTest.kt
index cc9312ba..170867a 100644
--- a/activity/activity-lint/src/test/java/androidx/activity/lint/ActivityResultFragmentVersionDetectorTest.kt
+++ b/activity/activity-lint/src/test/java/androidx/activity/lint/ActivityResultFragmentVersionDetectorTest.kt
@@ -21,6 +21,7 @@
 import com.android.tools.lint.checks.infrastructure.LintDetectorTest
 import com.android.tools.lint.detector.api.Detector
 import com.android.tools.lint.detector.api.Issue
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -185,6 +186,7 @@
             .run().expectClean()
     }
 
+    @Ignore // b/293517205
     @Test
     fun expectFailRegisterForActivityResult() {
         lint().files(
@@ -218,6 +220,7 @@
             )
     }
 
+    @Ignore // b/293517205
     @Test
     fun expectFailRegisterForActivityResultInMethod() {
         lint().files(
@@ -255,6 +258,7 @@
             )
     }
 
+    @Ignore // b/293517205
     @Test
     fun expectFailRegisterForActivityResultMultipleCalls() {
         lint().files(
@@ -297,6 +301,7 @@
             )
     }
 
+    @Ignore // b/293517205
     @Test
     fun expectFailTransitiveDependency() {
         val projectFragment = project(
diff --git a/activity/activity/lint-baseline.xml b/activity/activity/lint-baseline.xml
index 75b58da..c33c4d5 100644
--- a/activity/activity/lint-baseline.xml
+++ b/activity/activity/lint-baseline.xml
@@ -1,13 +1,67 @@
 <?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.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
-        id="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastT cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="        if (BuildCompat.isAtLeastT()) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        id="NewApi"
+        message="Field requires API level 19 (current min is 14): `ImageAndVideo`"
+        errorLine1="    mediaType: VisualMediaType = ImageAndVideo"
+        errorLine2="                                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/ComponentActivity.java"/>
+            file="src/main/java/androidx/activity/result/PickVisualMediaRequest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 19 (current min is 14): `ImageAndVideo`"
+        errorLine1="    var mediaType: VisualMediaType = ImageAndVideo"
+        errorLine2="                                     ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/activity/result/PickVisualMediaRequest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 19 (current min is 14): `ImageAndVideo`"
+        errorLine1="        private var mediaType: VisualMediaType = ImageAndVideo"
+        errorLine2="                                                 ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/activity/result/PickVisualMediaRequest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 19 (current min is 14): `VideoOnly`"
+        errorLine1="            ActivityResultContracts.PickVisualMedia.VideoOnly"
+        errorLine2="                                                    ~~~~~~~~~">
+        <location
+            file="src/androidTest/java/androidx/activity/result/PickVisualMediaRequestTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 19 (current min is 14): `VideoOnly`"
+        errorLine1="        assertThat(request.mediaType).isEqualTo(ActivityResultContracts.PickVisualMedia.VideoOnly)"
+        errorLine2="                                                                                        ~~~~~~~~~">
+        <location
+            file="src/androidTest/java/androidx/activity/result/PickVisualMediaRequestTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 19 (current min is 14): `VideoOnly`"
+        errorLine1="        val request = PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.VideoOnly)"
+        errorLine2="                                                                                     ~~~~~~~~~">
+        <location
+            file="src/androidTest/java/androidx/activity/result/PickVisualMediaRequestTest.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 19 (current min is 14): `VideoOnly`"
+        errorLine1="        assertThat(request.mediaType).isEqualTo(ActivityResultContracts.PickVisualMedia.VideoOnly)"
+        errorLine2="                                                                                        ~~~~~~~~~">
+        <location
+            file="src/androidTest/java/androidx/activity/result/PickVisualMediaRequestTest.kt"/>
     </issue>
 
 </issues>
diff --git a/appcompat/integration-tests/receive-content-testapp/lint-baseline.xml b/appcompat/integration-tests/receive-content-testapp/lint-baseline.xml
new file mode 100644
index 0000000..af8264e2
--- /dev/null
+++ b/appcompat/integration-tests/receive-content-testapp/lint-baseline.xml
@@ -0,0 +1,22 @@
+<?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="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(1000)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(eventTime - now - 10);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/swipe/ManualSwipeInjector.java"/>
+    </issue>
+
+</issues>
diff --git a/appsearch/appsearch-platform-storage/lint-baseline.xml b/appsearch/appsearch-platform-storage/lint-baseline.xml
deleted file mode 100644
index dd1d2ee..0000000
--- a/appsearch/appsearch-platform-storage/lint-baseline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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">
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR, AppSearchResult.RESULT_DENIED, but could be AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR"
-        errorLine1="                            platformResult.getResultCode(), platformResult.getErrorMessage()));"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/AppSearchResultToPlatformConverter.java"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR, AppSearchResult.RESULT_DENIED, but could be AppSearchResult.RESULT_OK, AppSearchResult.RESULT_UNKNOWN_ERROR, AppSearchResult.RESULT_INTERNAL_ERROR, AppSearchResult.RESULT_INVALID_ARGUMENT, AppSearchResult.RESULT_IO_ERROR, AppSearchResult.RESULT_OUT_OF_SPACE, AppSearchResult.RESULT_NOT_FOUND, AppSearchResult.RESULT_INVALID_SCHEMA, AppSearchResult.RESULT_SECURITY_ERROR"
-        errorLine1="                                            namespaceResult.getResultCode(),"
-        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appsearch/platformstorage/SearchSessionImpl.java"/>
-    </issue>
-
-</issues>
diff --git a/benchmark/benchmark-macro/lint-baseline.xml b/benchmark/benchmark-macro/lint-baseline.xml
index 30a22e1..61cf10432 100644
--- a/benchmark/benchmark-macro/lint-baseline.xml
+++ b/benchmark/benchmark-macro/lint-baseline.xml
@@ -1,5 +1,32 @@
 <?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.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 24 (current min is 23): `Partial`"
+        errorLine1="            is CompilationMode.Partial -> compilationMode.warmupIterations"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/benchmark/macro/Macrobenchmark.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 29 (current min is 23): `Power`"
+        errorLine1="            return if (type is PowerMetric.Type.Power) powerUw else energyUws"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/benchmark/macro/perfetto/PowerQuery.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 29 (current min is 23): `Power`"
+        errorLine1="            return if (type is PowerMetric.Type.Power) powerUw else energyUws"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/benchmark/macro/perfetto/PowerQuery.kt"/>
+    </issue>
 
     <issue
         id="BanThreadSleep"
@@ -46,13 +73,4 @@
             file="src/main/java/androidx/benchmark/macro/ProfileInstallBroadcast.kt"/>
     </issue>
 
-    <issue
-        id="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="                    if (BuildCompat.isAtLeastU() || Shell.isSessionRooted()) {"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/benchmark/macro/CompilationMode.kt"/>
-    </issue>
-
 </issues>
diff --git a/benchmark/integration-tests/macrobenchmark-target/lint-baseline.xml b/benchmark/integration-tests/macrobenchmark-target/lint-baseline.xml
index 4ac1b48..7a8a126 100644
--- a/benchmark/integration-tests/macrobenchmark-target/lint-baseline.xml
+++ b/benchmark/integration-tests/macrobenchmark-target/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="BanThreadSleep"
@@ -22,6 +22,24 @@
     <issue
         id="BanThreadSleep"
         message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(1000)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(eventTime - now - 10);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/swipe/ManualSwipeInjector.java"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
         errorLine1="                    trace(&quot;tracing&quot;) { Thread.sleep(50) }"
         errorLine2="                                              ~~~~~">
         <location
diff --git a/bluetooth/integration-tests/testapp/lint-baseline.xml b/bluetooth/integration-tests/testapp/lint-baseline.xml
new file mode 100644
index 0000000..b71b1a5
--- /dev/null
+++ b/bluetooth/integration-tests/testapp/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="DiffUtilEquals"
+        message="Suspicious equality check: `equals()` is not implemented in BluetoothDevice"
+        errorLine1="        return oldItem.device == newItem.device"
+        errorLine2="                              ~~">
+        <location
+            file="src/main/java/androidx/bluetooth/integration/testapp/ui/scanner/ScannerAdapter.kt"/>
+    </issue>
+
+</issues>
diff --git a/browser/browser/lint-baseline.xml b/browser/browser/lint-baseline.xml
deleted file mode 100644
index e24f015..0000000
--- a/browser/browser/lint-baseline.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-alpha11" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-alpha11)" variant="all" version="8.1.0-alpha11">
-
-    <issue
-        id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface ICustomTabsCallback {"
-        errorLine2="^">
-        <location
-            file="src/main/aidl/android/support/customtabs/ICustomTabsCallback.aidl"/>
-    </issue>
-
-    <issue
-        id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface ICustomTabsService {"
-        errorLine2="^">
-        <location
-            file="src/main/aidl/android/support/customtabs/ICustomTabsService.aidl"/>
-    </issue>
-
-    <issue
-        id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IEngagementSignalsCallback {"
-        errorLine2="^">
-        <location
-            file="src/main/aidl/android/support/customtabs/IEngagementSignalsCallback.aidl"/>
-    </issue>
-
-    <issue
-        id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IPostMessageService {"
-        errorLine2="^">
-        <location
-            file="src/main/aidl/android/support/customtabs/IPostMessageService.aidl"/>
-    </issue>
-
-    <issue
-        id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface ITrustedWebActivityCallback {"
-        errorLine2="^">
-        <location
-            file="src/main/aidl/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl"/>
-    </issue>
-
-    <issue
-        id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface ITrustedWebActivityService {"
-        errorLine2="^">
-        <location
-            file="src/main/aidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl"/>
-    </issue>
-
-</issues>
diff --git a/buildSrc-tests/src/test/java/androidx/build/AndroidXImplPluginTest.kt b/buildSrc-tests/src/test/java/androidx/build/AndroidXImplPluginTest.kt
index 970c9ea..d3b6f57 100644
--- a/buildSrc-tests/src/test/java/androidx/build/AndroidXImplPluginTest.kt
+++ b/buildSrc-tests/src/test/java/androidx/build/AndroidXImplPluginTest.kt
@@ -86,47 +86,4 @@
         val actual = removeTargetSdkVersion(manifest)
         Assert.assertEquals(expected, actual)
     }
-
-    @Test
-    fun testRemoveLineAndColumnAttributes() {
-        /* ktlint-disable max-line-length */
-        val baseline = """
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.0-alpha01)" variant="all" version="7.4.0-alpha01">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 14): `java.util.Optional#of`"
-        errorLine1="                return Optional.of(modeCompat);"
-        errorLine2="                                ~~">
-        <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="74"
-            column="33"/>
-    </issue>
-
-</issues>
-        """
-
-        // Expect that the line and column attributes are removed.
-        val expected = """
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.0-alpha01)" variant="all" version="7.4.0-alpha01">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 14): `java.util.Optional#of`"
-        errorLine1="                return Optional.of(modeCompat);"
-        errorLine2="                                ~~">
-        <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
-    </issue>
-
-</issues>
-        """
-        /* ktlint-enable max-line-length */
-
-        val actual = removeLineAndColumnAttributes(baseline)
-        Assert.assertEquals(expected, actual)
-    }
 }
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
index 21fb3f1..bd42717 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
@@ -1317,8 +1317,4 @@
     }
 }
 
-/** Removes the line and column attributes from the [baseline]. */
-fun removeLineAndColumnAttributes(baseline: String): String =
-    baseline.replace("\\s*(line|column)=\"\\d+?\"".toRegex(), "")
-
 const val PROJECT_OR_ARTIFACT_EXT_NAME = "projectOrArtifact"
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt b/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
index 28200ee..9636f5e 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
@@ -93,6 +93,11 @@
  * Android Lint configuration entry point for non-Android projects.
  */
 private fun Project.configureNonAndroidProjectForLint() = afterEvaluate {
+    // TODO(aurimas): remove this workaround for b/293900782 after upgrading to AGP 8.2.0-beta01
+    if (path == ":collection:collection-benchmark-kmp" ||
+        path == ":benchmark:benchmark-darwin-samples") {
+        return@afterEvaluate
+    }
     // The lint plugin expects certain configurations and source sets which are only added by
     // the Java and Android plugins. If this is a multiplatform project targeting JVM, we'll
     // need to manually create these configurations and source sets based on their multiplatform
@@ -312,19 +317,6 @@
         checkReleaseBuilds = false
     }
 
-    tasks.withType(AndroidLintTask::class.java).configureEach { task ->
-        // Remove the lint and column attributes from generated lint baseline XML.
-        if (task.name.startsWith("updateLintBaseline")) {
-            task.doLast {
-                task.projectInputs.lintOptions.baseline.orNull?.asFile?.let { file ->
-                    if (file.exists()) {
-                        file.writeText(removeLineAndColumnAttributes(file.readText()))
-                    }
-                }
-            }
-        }
-    }
-
     // Lint is configured entirely in finalizeDsl so that individual projects cannot easily
     // disable individual checks in the DSL for any reason.
     lint.apply {
diff --git a/camera/camera-camera2-pipe/lint-baseline.xml b/camera/camera-camera2-pipe/lint-baseline.xml
new file mode 100644
index 0000000..296ac95
--- /dev/null
+++ b/camera/camera-camera2-pipe/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="NewApi"
+        message="Class requires API level 33 (current min is 21): `ExternalOutputConfig`"
+        errorLine1="                        (output as? OutputStream.Config.ExternalOutputConfig)?.output"
+        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/camera2/pipe/graph/StreamGraphImpl.kt"/>
+    </issue>
+
+</issues>
diff --git a/camera/camera-extensions/lint-baseline.xml b/camera/camera-extensions/lint-baseline.xml
index 2931c74..92ee546 100644
--- a/camera/camera-extensions/lint-baseline.xml
+++ b/camera/camera-extensions/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="BanThreadSleep"
@@ -10,22 +10,4 @@
             file="src/main/java/androidx/camera/extensions/internal/compat/workaround/OnEnableDisableSessionDurationCheck.java"/>
     </issue>
 
-    <issue
-        id="BanThreadSleep"
-        message="Uses Thread.sleep()"
-        errorLine1="        Thread.sleep(duration)"
-        errorLine2="               ~~~~~">
-        <location
-            file="src/androidTest/java/androidx/camera/extensions/internal/compat/workaround/OnEnableDisableSessionDurationCheckTest.kt"/>
-    </issue>
-
-    <issue
-        id="BanThreadSleep"
-        message="Uses Thread.sleep()"
-        errorLine1="        Thread.sleep(duration)"
-        errorLine2="               ~~~~~">
-        <location
-            file="src/androidTest/java/androidx/camera/extensions/internal/compat/workaround/OnEnableDisableSessionDurationCheckTest.kt"/>
-    </issue>
-
 </issues>
diff --git a/camera/camera-testing/lint-baseline.xml b/camera/camera-testing/lint-baseline.xml
index 9b5a72b..5e26c64 100644
--- a/camera/camera-testing/lint-baseline.xml
+++ b/camera/camera-testing/lint-baseline.xml
@@ -1,14 +1,5 @@
 <?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">
-
-    <issue
-        id="BanThreadSleep"
-        message="Uses Thread.sleep()"
-        errorLine1="                    Thread.sleep(RETRY_DELAY_MS);"
-        errorLine2="                           ~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/CameraUtil.java"/>
-    </issue>
+<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="BanThreadSleep"
diff --git a/camera/camera-video/lint-baseline.xml b/camera/camera-video/lint-baseline.xml
index 303aa35..6cb1056 100644
--- a/camera/camera-video/lint-baseline.xml
+++ b/camera/camera-video/lint-baseline.xml
@@ -1,5 +1,14 @@
 <?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.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 21 (current min is 14): `Status`"
+        errorLine1="            is VideoRecordEvent.Status -> {"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidTest/java/androidx/camera/video/VideoRecordingTest.kt"/>
+    </issue>
 
     <issue
         id="BanThreadSleep"
@@ -37,13 +46,4 @@
             file="src/androidTest/java/androidx/camera/video/internal/encoder/VideoEncoderTest.kt"/>
     </issue>
 
-    <issue
-        id="IgnoreClassLevelDetector"
-        message="@Ignore should not be used at the class level. Move the annotation to each test individually."
-        errorLine1="@Ignore(&quot;b/274840083&quot;)"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/test/java/androidx/camera/video/internal/audio/AudioSourceTest.kt"/>
-    </issue>
-
 </issues>
diff --git a/car/app/app-samples/navigation/mobile/lint-baseline.xml b/car/app/app-samples/navigation/mobile/lint-baseline.xml
new file mode 100644
index 0000000..d28831e
--- /dev/null
+++ b/car/app/app-samples/navigation/mobile/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="ForegroundServicePermission"
+        message="foregroundServiceType:location requires permission:[android.permission.FOREGROUND_SERVICE_LOCATION] AND any permission in list:[android.permission.ACCESS_COARSE_LOCATION, android.permission.ACCESS_FINE_LOCATION]"
+        errorLine1="    &lt;service"
+        errorLine2="    ^">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+</issues>
diff --git a/car/app/app-samples/showcase/common/lint-baseline.xml b/car/app/app-samples/showcase/common/lint-baseline.xml
index 7034574..d9f9bc5 100644
--- a/car/app/app-samples/showcase/common/lint-baseline.xml
+++ b/car/app/app-samples/showcase/common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="BanThreadSleep"
@@ -11,12 +11,12 @@
     </issue>
 
     <issue
-        id="UnsafeOptInUsageError"
-        message="This declaration is opt-in and its usage should be marked with `@androidx.car.app.annotations.ExperimentalCarApi` or `@OptIn(markerClass = androidx.car.app.annotations.ExperimentalCarApi.class)`"
-        errorLine1="                .addAction(createFabBackAction())"
-        errorLine2="                 ~~~~~~~~~">
+        id="UnspecifiedRegisterReceiverFlag"
+        message="`mBroadcastReceiver` \&#xA;is missing `RECEIVER_EXPORTED` or `RECEIVER_NOT_EXPORTED` flag for unprotected \&#xA;broadcasts registered for androidx.car.app.sample.showcase.common.INTENT_ACTION_PRIMARY_PHONE, androidx.car.app.sample.showcase.common.INTENT_ACTION_SECONDARY_PHONE"
+        errorLine1="        getCarContext().registerReceiver(mBroadcastReceiver, filter);"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/showcase/common/screens/templatelayouts/tabtemplates/TabTemplateDemoScreen.java"/>
+            file="src/main/java/androidx/car/app/sample/showcase/common/screens/templatelayouts/gridtemplates/NotificationDemoScreen.java"/>
     </issue>
 
     <issue
diff --git a/car/app/app/lint-baseline.xml b/car/app/app/lint-baseline.xml
index e148a65..081db79 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.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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="MissingPermission"
@@ -362,15 +362,6 @@
     </issue>
 
     <issue
-        id="NullabilityAnnotationsDetector"
-        message="Use `@androidx.annotation.NonNull` instead of `@org.jetbrains.annotations.NotNull`"
-        errorLine1="    public void sendPanModeChanged(boolean isInPanMode, @NonNull @NotNull OnDoneCallback callback) {"
-        errorLine2="                                                                 ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/car/app/navigation/model/PanModeDelegateImpl.java"/>
-    </issue>
-
-    <issue
         id="PrivateConstructorForUtilityClass"
         message="Utility class is missing private constructor"
         errorLine1="class PersonsEqualityHelper {"
@@ -380,6 +371,24 @@
     </issue>
 
     <issue
+        id="UnspecifiedRegisterReceiverFlag"
+        message="`mBroadcastReceiver` \&#xA;is missing `RECEIVER_EXPORTED` or `RECEIVER_NOT_EXPORTED` flag for unprotected \&#xA;broadcasts registered for androidx.car.app.connection.action.CAR_CONNECTION_UPDATED"
+        errorLine1="            mContext.registerReceiver(mBroadcastReceiver, filter);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/car/app/connection/CarConnectionTypeLiveData.java"/>
+    </issue>
+
+    <issue
+        id="UnsafeOptInUsageError"
+        message="This declaration is opt-in and its usage should be marked with `@androidx.car.app.annotations.ExperimentalCarApi` or `@OptIn(markerClass = androidx.car.app.annotations.ExperimentalCarApi.class)`"
+        errorLine1="            } else if (rowObj instanceof ConversationItem) {"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/car/app/model/constraints/RowListConstraints.java"/>
+    </issue>
+
+    <issue
         id="SupportAnnotationUsage"
         message="This annotation does not apply for type java.util.List&lt;androidx.car.app.hardware.climate.CarClimateFeature>; expected int"
         errorLine1="    @ClimateProfileRequest.ClimateProfileFeature"
diff --git a/cardview/cardview/lint-baseline.xml b/cardview/cardview/lint-baseline.xml
new file mode 100644
index 0000000..bc26e05
--- /dev/null
+++ b/cardview/cardview/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="NewApi"
+        message="Class requires API level 21 (current min is 14): `CardViewApi21Impl`"
+        errorLine1="        if (!(IMPL instanceof CardViewApi21Impl)) {"
+        errorLine2="                              ~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/cardview/widget/CardView.java"/>
+    </issue>
+
+</issues>
diff --git a/collection/collection/lint-baseline.xml b/collection/collection/lint-baseline.xml
new file mode 100644
index 0000000..2c81c26
--- /dev/null
+++ b/collection/collection/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(100)"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/jvmTest/kotlin/androidx/collection/SimpleArrayMapJvmTest.kt"/>
+    </issue>
+
+</issues>
diff --git a/compose/animation/animation-core/lint-baseline.xml b/compose/animation/animation-core/lint-baseline.xml
index 9b3a498..b9a2423 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.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="PrimitiveInLambda"
@@ -66,7 +66,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateFloatAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Float, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateFloatAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Float, Unit>."
         errorLine1="    finishedListener: ((Float) -> Unit)? = null"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
         <location
@@ -75,7 +75,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateDpAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Dp, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateDpAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Dp, Unit>."
         errorLine1="    finishedListener: ((Dp) -> Unit)? = null"
         errorLine2="                      ~~~~~~~~~~~~~~~">
         <location
@@ -84,7 +84,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateSizeAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Size, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateSizeAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Size, Unit>."
         errorLine1="    finishedListener: ((Size) -> Unit)? = null"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
@@ -93,7 +93,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateOffsetAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Offset, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateOffsetAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Offset, Unit>."
         errorLine1="    finishedListener: ((Offset) -> Unit)? = null"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -102,7 +102,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateIntAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Integer, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateIntAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Integer, Unit>."
         errorLine1="    finishedListener: ((Int) -> Unit)? = null"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
         <location
@@ -111,7 +111,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateIntOffsetAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super IntOffset, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateIntOffsetAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super IntOffset, Unit>."
         errorLine1="    finishedListener: ((IntOffset) -> Unit)? = null"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -120,7 +120,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateIntSizeAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super IntSize, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateIntSizeAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super IntSize, Unit>."
         errorLine1="    finishedListener: ((IntSize) -> Unit)? = null"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/compose/animation/animation/lint-baseline.xml b/compose/animation/animation/lint-baseline.xml
index 5f05c6f..76c606a 100644
--- a/compose/animation/animation/lint-baseline.xml
+++ b/compose/animation/animation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="PrimitiveInLambda"
@@ -255,7 +255,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateColorAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Color, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method animateColorAsState has parameter &apos;finishedListener&apos; with type Function1&lt;? super Color, Unit>."
         errorLine1="    finishedListener: ((Color) -> Unit)? = null"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
         <location
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 07ba822..4944215 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/lint-baseline.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="NewApi"
+        message="Call requires API level 24 (current min is 21): `java.util.Map#getOrDefault`"
+        errorLine1="                val selected = selectedIndexes.getOrDefault(item, false)"
+        errorLine2="                                               ~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/compose/foundation/demos/ListDemos.kt"/>
+    </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="PrimitiveInLambda"
diff --git a/compose/foundation/foundation/lint-baseline.xml b/compose/foundation/foundation/lint-baseline.xml
index c5a68c5..b49d292f 100644
--- a/compose/foundation/foundation/lint-baseline.xml
+++ b/compose/foundation/foundation/lint-baseline.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 28 (current min is 21): `PlatformMagnifierImpl`"
+        errorLine1="                    ) as PlatformMagnifierFactoryApi28Impl.PlatformMagnifierImpl"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/foundation/PlatformMagnifierTest.kt"/>
+    </issue>
 
     <issue
         id="BanThreadSleep"
@@ -480,7 +489,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method items has parameter &apos;itemContent&apos; with type Function2&lt;? super LazyItemScope, ? super Integer, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method items has parameter &apos;itemContent&apos; with type Function2&lt;? super LazyItemScope, ? super Integer, Unit>."
         errorLine1="        itemContent: @Composable LazyItemScope.(index: Int) -> Unit"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2046,7 +2055,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method platformSpecificTextInputSession has parameter &apos;onImeAction&apos; with type Function1&lt;? super ImeAction, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method platformSpecificTextInputSession has parameter &apos;onImeAction&apos; with type Function1&lt;? super ImeAction, Unit>."
         errorLine1="    onImeAction: ((ImeAction) -> Unit)?"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/compose/integration-tests/demos/lint-baseline.xml b/compose/integration-tests/demos/lint-baseline.xml
new file mode 100644
index 0000000..7cde1bf
--- /dev/null
+++ b/compose/integration-tests/demos/lint-baseline.xml
@@ -0,0 +1,22 @@
+<?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">
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(1000)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(eventTime - now - 10);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/swipe/ManualSwipeInjector.java"/>
+    </issue>
+
+</issues>
diff --git a/compose/lint/internal-lint-checks/lint-baseline.xml b/compose/lint/internal-lint-checks/lint-baseline.xml
new file mode 100644
index 0000000..c8ab761
--- /dev/null
+++ b/compose/lint/internal-lint-checks/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="LintImplUseUast"
+        message="Don&apos;t call `PsiMember#getContainingClass()`; you should use UAST instead and call `getContainingUClass()`"
+        errorLine1="                        &quot;constructor ${parent.containingClass?.name}&quot;"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/compose/lint/PrimitiveInLambdaDetector.kt"/>
+    </issue>
+
+</issues>
diff --git a/compose/material3/material3/lint-baseline.xml b/compose/material3/material3/lint-baseline.xml
index e295f4e..ae3e747 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.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="BanThreadSleep"
@@ -182,24 +182,6 @@
     </issue>
 
     <issue
-        id="ExperimentalPropertyAnnotation"
-        message="This property does not have all required annotations to correctly mark it as experimental."
-        errorLine1="    @ExperimentalMaterial3Api"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="ExperimentalPropertyAnnotation"
-        message="This property does not have all required annotations to correctly mark it as experimental."
-        errorLine1="    @ExperimentalMaterial3Api"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
         id="PrimitiveInLambda"
         message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;bottomSheet&apos; with type Function1&lt;? super Integer, Unit>."
         errorLine1="    bottomSheet: @Composable (layoutHeight: Int) -> Unit,"
@@ -678,42 +660,6 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor DismissState has parameter &apos;positionalThreshold&apos; with type Function2&lt;? super Density, ? super Float, Float>."
-        errorLine1="    positionalThreshold: Density.(totalDistance: Float) -> Float ="
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeToDismiss.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;positionalThreshold&apos; with type Function2&lt;? super Density, ? super Float, Float>."
-        errorLine1="            positionalThreshold: Density.(totalDistance: Float) -> Float,"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeToDismiss.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method rememberDismissState has parameter &apos;positionalThreshold&apos; with type Function2&lt;? super Density, ? super Float, Float>."
-        errorLine1="    positionalThreshold: Density.(totalDistance: Float) -> Float ="
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeToDismiss.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Density, Float, Float> of &apos;getFixedPositionalThreshold&apos;."
-        errorLine1="    val FixedPositionalThreshold: Density.(totalDistance: Float) -> Float = { _ -> 56.dp.toPx() }"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeToDismiss.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
         message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method setThresholds$lint_module has parameter &apos;&lt;set-?>&apos; with type Function2&lt;? super Float, ? super Float, Float>."
         errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -750,78 +696,6 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor SwipeableV2State has parameter &apos;positionalThreshold&apos; with type Function2&lt;? super Density, ? super Float, Float>."
-        errorLine1="    internal val positionalThreshold: Density.(totalDistance: Float) -> Float ="
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Density, Float, Float> of &apos;getPositionalThreshold$lint_module&apos;."
-        errorLine1="    internal val positionalThreshold: Density.(totalDistance: Float) -> Float ="
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;positionalThreshold&apos; with type Function2&lt;? super Density, ? super Float, Float>."
-        errorLine1="            positionalThreshold: Density.(distance: Float) -> Float,"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Density, Float, Float> of &apos;fixedPositionalThreshold&apos;."
-        errorLine1="internal fun fixedPositionalThreshold(threshold: Dp): Density.(distance: Float) -> Float = {"
-        errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Density, Float, Float> of &apos;fractionalPositionalThreshold&apos;."
-        errorLine1="): Density.(distance: Float) -> Float = { distance -> distance * fraction }"
-        errorLine2="   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Density, Float, Float> of &apos;getPositionalThreshold&apos;."
-        errorLine1="    val PositionalThreshold: Density.(totalDistance: Float) -> Float ="
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method ReconcileAnimationOnAnchorChangeHandler$lint_module has parameter &apos;animate&apos; with type Function2&lt;? super T, ? super Float, Unit>."
-        errorLine1="        animate: (target: T, velocity: Float) -> Unit,"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor SwipeAnchorsModifier has parameter &apos;onSizeChanged&apos; with type Function1&lt;? super IntSize, Unit>."
-        errorLine1="    private val onSizeChanged: (layoutSize: IntSize) -> Unit,"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/material3/SwipeableV2.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
         message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;valueToOffset&apos; with type Function1&lt;? super Boolean, ? extends Float>."
         errorLine1="    val valueToOffset = remember&lt;(Boolean) -> Float>(minBound, maxBound) {"
         errorLine2="    ^">
diff --git a/compose/ui/ui-lint/lint-baseline.xml b/compose/ui/ui-lint/lint-baseline.xml
new file mode 100644
index 0000000..15ca04b
--- /dev/null
+++ b/compose/ui/ui-lint/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="LintImplUseUast"
+        message="Don&apos;t call `PsiMember#getContainingClass()`; you should use UAST instead and call `getContainingUClass()`"
+        errorLine1="            if (node.containingClass.isClConsumerNode()) {"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/compose/ui/lint/SuspiciousCompositionLocalModifierReadDetector.kt"/>
+    </issue>
+
+</issues>
diff --git a/compose/ui/ui-text/lint-baseline.xml b/compose/ui/ui-text/lint-baseline.xml
index c00a104..8eb1759 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.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="BanInlineOptIn"
@@ -57,7 +57,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method transform has parameter &apos;transform&apos; with type Function3&lt;? super String, ? super Integer, ? super Integer, ? extends String>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method transform has parameter &apos;transform&apos; with type Function3&lt;? super String, ? super Integer, ? super Integer, String>."
         errorLine1="    transform: (String, Int, Int) -> String"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
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 2e6c0a4..fd3c355 100644
--- a/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml
+++ b/compose/ui/ui/integration-tests/ui-demos/lint-baseline.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(1000)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(eventTime - now - 10);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/swipe/ManualSwipeInjector.java"/>
+    </issue>
 
     <issue
         id="PrimitiveInLambda"
diff --git a/compose/ui/ui/lint-baseline.xml b/compose/ui/ui/lint-baseline.xml
index c663909..24d2ebd 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.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="BanHideAnnotation"
@@ -640,22 +640,4 @@
             file="src/commonMain/kotlin/androidx/compose/ui/graphics/vector/VectorPainter.kt"/>
     </issue>
 
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method composeVector has parameter &apos;composable&apos; with type Function2&lt;? super Float, ? super Float, Unit>."
-        errorLine1="        composable: @Composable (viewportWidth: Float, viewportHeight: Float) -> Unit"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/ui/graphics/vector/VectorPainter.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method RenderVector$lint_module has parameter &apos;content&apos; with type Function2&lt;? super Float, ? super Float, Unit>."
-        errorLine1="        content: @Composable (viewportWidth: Float, viewportHeight: Float) -> Unit"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/commonMain/kotlin/androidx/compose/ui/graphics/vector/VectorPainter.kt"/>
-    </issue>
-
 </issues>
diff --git a/constraintlayout/constraintlayout-compose/lint-baseline.xml b/constraintlayout/constraintlayout-compose/lint-baseline.xml
index 32d1e09..cacb99a 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.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.2.0-alpha14" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="BanInlineOptIn"
@@ -127,13 +127,4 @@
             file="src/androidMain/kotlin/androidx/constraintlayout/compose/MotionCarousel.kt"/>
     </issue>
 
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method fromState has parameter &apos;onUpdate&apos; with type Function1&lt;? super Float, Unit>."
-        errorLine1="            onUpdate: (newProgress: Float) -> Unit"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/constraintlayout/compose/MotionLayout.kt"/>
-    </issue>
-
 </issues>
diff --git a/core/core-appdigest/lint-baseline.xml b/core/core-appdigest/lint-baseline.xml
deleted file mode 100644
index 0907387..0000000
--- a/core/core-appdigest/lint-baseline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 29 (current min is 24): `android.app.UiAutomation#adoptShellPermissionIdentity`"
-        errorLine1="            getUiAutomation().adoptShellPermissionIdentity(Manifest.permission.INSTALL_PACKAGES);"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 29 (current min is 24): `android.app.UiAutomation#dropShellPermissionIdentity`"
-        errorLine1="                getUiAutomation().dropShellPermissionIdentity();"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java"/>
-    </issue>
-
-</issues>
diff --git a/core/core-telecom/lint-baseline.xml b/core/core-telecom/lint-baseline.xml
index 0df9fc9..f9447de 100644
--- a/core/core-telecom/lint-baseline.xml
+++ b/core/core-telecom/lint-baseline.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-beta03)" variant="all" version="8.1.0-alpha07">
+<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="ImplicitCastClassVerificationFailure"
-        message="This expression has type android.telecom.CallException (introduced in API level 34) but it used as type java.lang.Throwable (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="                        openResult.completeExceptionally(reason)"
-        errorLine2="                                                         ~~~~~~">
+        id="NewApi"
+        message="Field requires API level 26 (current min is 14): `Companion`"
+        errorLine1="            return hasCapability(CallsManager.CAPABILITY_SUPPORTS_VIDEO_CALLING, bitMap)"
+        errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/telecom/CallsManager.kt"/>
+            file="src/main/java/androidx/core/telecom/internal/utils/Utils.kt"/>
     </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 26 (current min is 14): `Companion`"
+        errorLine1="            return hasCapability(CallsManager.CAPABILITY_SUPPORTS_CALL_STREAMING, bitMap)"
+        errorLine2="                                 ~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/telecom/internal/utils/Utils.kt"/>
+    </issue>
+
 </issues>
diff --git a/core/core/lint-baseline.xml b/core/core/lint-baseline.xml
index 44d14fe..5a6970a 100644
--- a/core/core/lint-baseline.xml
+++ b/core/core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="NewApi"
@@ -714,9 +714,18 @@
 
     <issue
         id="NewApi"
+        message="Class requires API level 26 (current min is 14): `OreoCallback`"
+        errorLine1="        if (callback instanceof OreoCallback &amp;&amp; Build.VERSION.SDK_INT >= 26) {"
+        errorLine2="                                ~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/widget/TextViewCompat.java"/>
+    </issue>
+
+    <issue
+        id="NewApi"
         message="Call requires API level 20 (current min is 14): `android.view.View#requestApplyInsets`"
-        errorLine1="        requestApplyInsets()"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~">
+        errorLine1="    post { requestApplyInsets() }"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidTest/java/androidx/core/view/WindowInsetsCompatActivityTest.kt"/>
     </issue>
@@ -731,6 +740,15 @@
     </issue>
 
     <issue
+        id="StartActivityAndCollapseDeprecated"
+        message="TileService#startActivityAndCollapse(Intent) is deprecated. Use TileService#startActivityAndCollapse(PendingIntent) instead."
+        errorLine1="            service.startActivityAndCollapse(intent);"
+        errorLine2="                                             ~~~~~~">
+        <location
+            file="src/main/java/androidx/core/service/quicksettings/TileServiceCompat.java"/>
+    </issue>
+
+    <issue
         id="WrongConstant"
         message="Must be one of: Callback.DISPATCH_MODE_STOP, Callback.DISPATCH_MODE_CONTINUE_ON_SUBTREE"
         errorLine1="                super(compat.getDispatchMode());"
@@ -1380,42 +1398,6 @@
 
     <issue
         id="ClassVerificationFailure"
-        message="This call references a method added in API level 30; 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.getStateDescription();"
-        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 30; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setStateDescription(stateDescription);"
-        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.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return mInfo.getUniqueId();"
-        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.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            mInfo.setUniqueId(uniqueId);"
-        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 18; however, the containing class androidx.core.view.accessibility.AccessibilityNodeInfoCompat is reachable from earlier API levels and will fail run-time class verification."
         errorLine1="            mInfo.setViewIdResourceName(viewId);"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
diff --git a/credentials/credentials/lint-baseline.xml b/credentials/credentials/lint-baseline.xml
index 48549177..491e7c4 100644
--- a/credentials/credentials/lint-baseline.xml
+++ b/credentials/credentials/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.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"
@@ -562,8 +562,8 @@
     <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(&quot;type&quot;, 1))"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        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>
@@ -571,8 +571,8 @@
     <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(&quot;type&quot;, 1))"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~">
+        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>
@@ -580,8 +580,8 @@
     <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(&quot;type&quot;, 1))"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        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>
@@ -589,8 +589,8 @@
     <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(&quot;type&quot;, 1))"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~">
+        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>
diff --git a/development/update_studio.sh b/development/update_studio.sh
index ae6bab6..74fc2b3 100755
--- a/development/update_studio.sh
+++ b/development/update_studio.sh
@@ -7,8 +7,8 @@
 
 # Get versions
 echo Getting Studio version and link
-AGP_VERSION=${1:-8.1.0}
-STUDIO_VERSION_STRING=${2:-"Android Studio Giraffe | 2022.3.1"}
+AGP_VERSION=${1:-8.2.0-alpha15}
+STUDIO_VERSION_STRING=${2:-"Android Studio Hedgehog | 2023.1.1 Canary 15"}
 STUDIO_IFRAME_LINK=`curl "https://developer.android.com/studio/archive.html" | grep "<iframe " | sed "s/.* src=\"\([^\"]*\)\".*/\1/g"`
 echo iframe link $STUDIO_IFRAME_LINK
 STUDIO_IFRAME_REDIRECT=`curl -s $STUDIO_IFRAME_LINK | grep href | sed 's/.*href="\([^"]*\)".*/\1/g'`
diff --git a/dynamicanimation/dynamicanimation/lint-baseline.xml b/dynamicanimation/dynamicanimation/lint-baseline.xml
index 124a9d0..63482d4 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.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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="BanThreadSleep"
@@ -31,33 +31,6 @@
     <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
-        errorLine1="        if (!getAnimationHandler().isCurrentThread()) {"
-        errorLine2="                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="        if (!getAnimationHandler().isCurrentThread()) {"
-        errorLine2="                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="            getAnimationHandler().addAnimationFrameCallback(this, 0);"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
         errorLine1="        float durationScale = getAnimationHandler().getDurationScale();"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~">
         <location
@@ -67,60 +40,6 @@
     <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
-        errorLine1="        getAnimationHandler().removeCallback(this);"
-        errorLine2="                              ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="        return mAnimationHandler != null ? mAnimationHandler.getScheduler()"
-        errorLine2="                                                             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="                : AnimationHandler.getInstance().getScheduler();"
-        errorLine2="                                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="                : AnimationHandler.getInstance().getScheduler();"
-        errorLine2="                                                 ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="        if (mAnimationHandler != null &amp;&amp; mAnimationHandler.getScheduler() == scheduler) {"
-        errorLine2="                                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="        mAnimationHandler = new AnimationHandler(scheduler);"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
         errorLine1="        if (!getAnimationHandler().isCurrentThread()) {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -128,15 +47,6 @@
     </issue>
 
     <issue
-        id="VisibleForTests"
-        message="This method should only be accessed from tests or within private scope"
-        errorLine1="        if (!getAnimationHandler().isCurrentThread()) {"
-        errorLine2="                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.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 T addEndListener(OnAnimationEndListener listener) {"
diff --git a/emoji/emoji/lint-baseline.xml b/emoji/emoji/lint-baseline.xml
index c9ce755..4555808 100644
--- a/emoji/emoji/lint-baseline.xml
+++ b/emoji/emoji/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="NewApi"
@@ -165,87 +165,6 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 19 (current min is 14): `EmojiTextWatcher`"
-        errorLine1="        mTextWatcher = new EmojiTextWatcher(editText);"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 19 (current min is 14): `onTextChanged`"
-        errorLine1="        mTextWatcher.onTextChanged(testString, 0, 0, 1);"
-        errorLine2="                     ~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 19 (current min is 14): `onTextChanged`"
-        errorLine1="        mTextWatcher.onTextChanged(testString, 0, 0, 1);"
-        errorLine2="                     ~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 19 (current min is 14): `onTextChanged`"
-        errorLine1="        mTextWatcher.onTextChanged(testString, 0, 0, 1);"
-        errorLine2="                     ~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 19 (current min is 14): `getEmojiReplaceStrategy`"
-        errorLine1="        assertEquals(EmojiCompat.REPLACE_STRATEGY_DEFAULT, mTextWatcher.getEmojiReplaceStrategy());"
-        errorLine2="                                                                        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 19 (current min is 14): `onTextChanged`"
-        errorLine1="        mTextWatcher.onTextChanged(testString, 0, 0, 1);"
-        errorLine2="                     ~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 19 (current min is 14): `setEmojiReplaceStrategy`"
-        errorLine1="        mTextWatcher.setEmojiReplaceStrategy(EmojiCompat.REPLACE_STRATEGY_ALL);"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 19 (current min is 14): `onTextChanged`"
-        errorLine1="        mTextWatcher.onTextChanged(testString, 0, 0, 1);"
-        errorLine2="                     ~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 19 (current min is 14): `onTextChanged`"
-        errorLine1="        mTextWatcher.onTextChanged(testString, 0, 0, 1);"
-        errorLine2="                     ~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
         message="Call requires API level 19 (current min is 14): `EmojiTransformationMethod`"
         errorLine1="        mTransformationMethod = new EmojiTransformationMethod(mWrappedTransformationMethod);"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -328,6 +247,15 @@
     <issue
         id="NewApi"
         message="Class requires API level 19 (current min is 14): `EmojiSpan`"
+        errorLine1="            return span instanceof EmojiSpan;"
+        errorLine2="                                   ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/emoji/widget/SpannableBuilder.java"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 19 (current min is 14): `EmojiSpan`"
         errorLine1="        final EmojiSpan span = mock(EmojiSpan.class);"
         errorLine2="                                    ~~~~~~~~~~~~~~~">
         <location
diff --git a/emoji2/emoji2/lint-baseline.xml b/emoji2/emoji2/lint-baseline.xml
new file mode 100644
index 0000000..8f8dcf7
--- /dev/null
+++ b/emoji2/emoji2/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="NewApi"
+        message="Class requires API level 19 (current min is 14): `EmojiSpan`"
+        errorLine1="            return span instanceof EmojiSpan;"
+        errorLine2="                                   ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/emoji2/text/SpannableBuilder.java"/>
+    </issue>
+
+</issues>
diff --git a/glance/glance-appwidget/lint-baseline.xml b/glance/glance-appwidget/lint-baseline.xml
index 006d6ff..87160dc 100644
--- a/glance/glance-appwidget/lint-baseline.xml
+++ b/glance/glance-appwidget/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="BanThreadSleep"
@@ -29,15 +29,6 @@
     </issue>
 
     <issue
-        id="BanThreadSleep"
-        message="Uses Thread.sleep()"
-        errorLine1="            Thread.sleep(interval)"
-        errorLine2="                   ~~~~~">
-        <location
-            file="src/androidTest/kotlin/androidx/glance/appwidget/GlanceAppWidgetReceiverTest.kt"/>
-    </issue>
-
-    <issue
         id="PrimitiveInLambda"
         message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method extractAllSizes has parameter &apos;minSize&apos; with type Function0&lt;DpSize>."
         errorLine1="internal fun Bundle.extractAllSizes(minSize: () -> DpSize): List&lt;DpSize> {"
diff --git a/glance/glance-wear-tiles/integration-tests/demos/lint-baseline.xml b/glance/glance-wear-tiles/integration-tests/demos/lint-baseline.xml
new file mode 100644
index 0000000..667a1f6a
--- /dev/null
+++ b/glance/glance-wear-tiles/integration-tests/demos/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="WearStandaloneAppFlag"
+        message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
+        errorLine1="    &lt;application"
+        errorLine2="     ~~~~~~~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+</issues>
diff --git a/glance/glance-wear-tiles/integration-tests/template-demos/lint-baseline.xml b/glance/glance-wear-tiles/integration-tests/template-demos/lint-baseline.xml
new file mode 100644
index 0000000..667a1f6a
--- /dev/null
+++ b/glance/glance-wear-tiles/integration-tests/template-demos/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="WearStandaloneAppFlag"
+        message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
+        errorLine1="    &lt;application"
+        errorLine2="     ~~~~~~~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+</issues>
diff --git a/gradle.properties b/gradle.properties
index 50bdb04..a9e9c6f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,7 @@
 org.gradle.unsafe.configuration-cache-problems=fail
 org.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=**/.gradle/.android/analytics.settings;**/intermediates/cxx;**/intermediates/cxx/*;**/nativeBuildStaging/cmake/*/*/*;.cxx/structured-log;**/prefab_package_header_only/prefab_publication.json;**/prefab_package_header_only/prefab_publication.json/*;**/prebuilts/fullsdk-linux;**/prebuilts/fullsdk-linux/platforms/android-*/package.xml;**/androidx/compose/lint/common/build/libs/common.jar
 
+android.lint.baselineOmitLineNumbers=true
 android.lint.printStackTrace=true
 android.builder.sdkDownload=false
 android.uniquePackageNames=false
@@ -52,7 +53,7 @@
 
 # Disallow resolving dependencies at configuration time, which is a slight performance problem
 android.dependencyResolutionAtConfigurationTime.disallow=true
-android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.dependencyResolutionAtConfigurationTime.disallow,android.experimental.lint.missingBaselineIsEmptyBaseline,android.lint.printStackTrace,android.experimental.disableCompileSdkChecks,android.overrideVersionCheck,android.r8.maxWorkers
+android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.dependencyResolutionAtConfigurationTime.disallow,android.experimental.lint.missingBaselineIsEmptyBaseline,android.lint.printStackTrace,android.lint.baselineOmitLineNumbers,android.experimental.disableCompileSdkChecks,android.overrideVersionCheck,android.r8.maxWorkers
 # Workaround for b/162074215
 android.includeDependencyInfoInApks=false
 # Allow multiple r8 tasks at once because otherwise they can make the critical path longer: b/256187923
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 28950cc..137b722 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.1.0"
+androidGradlePlugin = "8.2.0-alpha15"
 # 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.1.0"
+androidLint = "31.2.0-alpha15"
 # 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 = "2022.3.1.18"
+androidStudio = "2023.1.1.15"
 # -----------------------------------------------------------------------------
 
 androidGradlePluginMin = "7.0.4"
diff --git a/graphics/graphics-core/lint-baseline.xml b/graphics/graphics-core/lint-baseline.xml
index a01fd91..8fbd449f 100644
--- a/graphics/graphics-core/lint-baseline.xml
+++ b/graphics/graphics-core/lint-baseline.xml
@@ -1,13 +1,256 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
-        id="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="            return if (BuildCompat.isAtLeastU()) {"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~">
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_0 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_90"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/graphics/lowlatency/SingleBufferedCanvasRenderer.kt"/>
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_90 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_180"
+        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_180 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_270"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_270 -> SurfaceControlCompat.BUFFER_TRANSFORM_IDENTITY"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_0 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_180"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_90 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_270"
+        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_180 -> SurfaceControlCompat.BUFFER_TRANSFORM_IDENTITY"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_270 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_90"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_0 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_270"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_90 -> SurfaceControlCompat.BUFFER_TRANSFORM_IDENTITY"
+        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_180 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_90"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_270 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_180"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_0 -> SurfaceControlCompat.BUFFER_TRANSFORM_IDENTITY"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_90 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_90"
+        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_180 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_180"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                    Surface.ROTATION_270 -> SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_270"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformHintResolver.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="            SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_90 ->"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_270"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="            SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_180 ->"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_180"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="            SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_270 ->"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_90"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="            SurfaceControlCompat.BUFFER_TRANSFORM_IDENTITY ->"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="                SurfaceControlCompat.BUFFER_TRANSFORM_IDENTITY"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="            SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_90 -> {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="            SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_180 -> {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="            SurfaceControlCompat.BUFFER_TRANSFORM_ROTATE_270 -> {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 29 (current min is 17): `Companion`"
+        errorLine1="            SurfaceControlCompat.BUFFER_TRANSFORM_IDENTITY -> {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/graphics/lowlatency/BufferTransformer.kt"/>
     </issue>
 
 </issues>
diff --git a/graphics/integration-tests/testapp-compose/lint-baseline.xml b/graphics/integration-tests/testapp-compose/lint-baseline.xml
index 77a40dc..49e5f2e 100644
--- a/graphics/integration-tests/testapp-compose/lint-baseline.xml
+++ b/graphics/integration-tests/testapp-compose/lint-baseline.xml
@@ -1,14 +1,5 @@
 <?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">
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method MorphComposable has parameter &apos;progress&apos; with type Function0&lt;Float>."
-        errorLine1="    progress: () -> Float,"
-        errorLine2="              ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/graphics/shapes/testcompose/MainActivity.kt"/>
-    </issue>
+<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="PrimitiveInLambda"
diff --git a/health/connect/connect-client/lint-baseline.xml b/health/connect/connect-client/lint-baseline.xml
index d0e77cb..1762dc6 100644
--- a/health/connect/connect-client/lint-baseline.xml
+++ b/health/connect/connect-client/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="BanSynchronizedMethods"
@@ -12,18 +12,14 @@
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable AggregateDataRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/AggregateDataRequest.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable AggregateDataResponse;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/response/AggregateDataResponse.aidl"/>
     </issue>
@@ -32,25 +28,21 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ChangesEvent;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/changes/ChangesEvent.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable DeleteDataRangeRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/DeleteDataRangeRequest.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable DeleteDataRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/DeleteDataRequest.aidl"/>
     </issue>
@@ -59,34 +51,28 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ErrorStatus;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/error/ErrorStatus.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable GetChangesRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/GetChangesRequest.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable GetChangesResponse;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/response/GetChangesResponse.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable GetChangesTokenRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/GetChangesTokenRequest.aidl"/>
     </issue>
@@ -95,7 +81,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable GetChangesTokenResponse;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/response/GetChangesTokenResponse.aidl"/>
     </issue>
@@ -103,8 +89,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IAggregateDataCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.response.AggregateDataResponse;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IAggregateDataCallback.aidl"/>
     </issue>
@@ -112,8 +98,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IClearOnChangesListenerCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IClearOnChangesListenerCallback.aidl"/>
     </issue>
@@ -121,8 +107,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IDeleteDataCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IDeleteDataCallback.aidl"/>
     </issue>
@@ -130,7 +116,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IDeleteDataRangeCallback {"
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IDeleteDataRangeCallback.aidl"/>
@@ -139,7 +125,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IFilterGrantedPermissionsCallback {"
+        errorLine1="  void onSuccess(in List&lt;Permission> permissions) = 0;"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IFilterGrantedPermissionsCallback.aidl"/>
@@ -148,7 +134,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IGetChangesCallback {"
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IGetChangesCallback.aidl"/>
@@ -157,7 +143,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IGetChangesTokenCallback {"
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IGetChangesTokenCallback.aidl"/>
@@ -166,8 +152,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IGetGrantedPermissionsCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.permission.Permission;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IGetGrantedPermissionsCallback.aidl"/>
     </issue>
@@ -175,7 +161,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IGetIsInForegroundCallback {"
+        errorLine1="}"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetIsInForegroundCallback.aidl"/>
@@ -184,7 +170,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IGetPermissionTokenCallback {"
+        errorLine1="}"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetPermissionTokenCallback.aidl"/>
@@ -193,7 +179,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IHealthDataSdkService {"
+        errorLine1="import androidx.health.platform.client.impl.sdkservice.ISetPermissionTokenCallback;"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/health/platform/client/impl/sdkservice/IHealthDataSdkService.aidl"/>
@@ -202,8 +188,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IHealthDataService {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.permission.Permission;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IHealthDataService.aidl"/>
     </issue>
@@ -211,8 +197,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IInsertDataCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IInsertDataCallback.aidl"/>
     </issue>
@@ -220,8 +206,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IOnChangesListener {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.changes.ChangesEvent;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IOnChangesListener.aidl"/>
     </issue>
@@ -229,8 +215,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IReadDataCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IReadDataCallback.aidl"/>
     </issue>
@@ -238,8 +224,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IReadDataRangeCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IReadDataRangeCallback.aidl"/>
     </issue>
@@ -247,8 +233,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IReadExerciseRouteCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IReadExerciseRouteCallback.aidl"/>
     </issue>
@@ -256,8 +242,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IRegisterForDataNotificationsCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IRegisterForDataNotificationsCallback.aidl"/>
     </issue>
@@ -265,8 +251,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IRevokeAllPermissionsCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IRevokeAllPermissionsCallback.aidl"/>
     </issue>
@@ -274,8 +260,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface ISetOnChangesListenerCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/ISetOnChangesListenerCallback.aidl"/>
     </issue>
@@ -283,7 +269,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface ISetPermissionTokenCallback {"
+        errorLine1=""
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/health/platform/client/impl/sdkservice/ISetPermissionTokenCallback.aidl"/>
@@ -292,8 +278,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IUnregisterFromDataNotificationsCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IUnregisterFromDataNotificationsCallback.aidl"/>
     </issue>
@@ -301,8 +287,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IUpdateDataCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IUpdateDataCallback.aidl"/>
     </issue>
@@ -310,8 +296,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IUpsertExerciseRouteCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.health.platform.client.error.ErrorStatus;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/service/IUpsertExerciseRouteCallback.aidl"/>
     </issue>
@@ -320,25 +306,21 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable InsertDataResponse;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/response/InsertDataResponse.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable Permission;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/permission/Permission.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable ReadDataRangeRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/ReadDataRangeRequest.aidl"/>
     </issue>
@@ -347,16 +329,14 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ReadDataRangeResponse;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/response/ReadDataRangeResponse.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable ReadDataRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/ReadDataRequest.aidl"/>
     </issue>
@@ -365,16 +345,14 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ReadDataResponse;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/response/ReadDataResponse.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable ReadExerciseRouteRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/ReadExerciseRouteRequest.aidl"/>
     </issue>
@@ -383,52 +361,42 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ReadExerciseRouteResponse;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/health/platform/client/response/ReadExerciseRouteResponse.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable RegisterForDataNotificationsRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/RegisterForDataNotificationsRequest.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable RequestContext;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/RequestContext.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable UnregisterFromDataNotificationsRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/UnregisterFromDataNotificationsRequest.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable UpsertDataRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/UpsertDataRequest.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable UpsertExerciseRouteRequest;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/health/platform/client/request/UpsertExerciseRouteRequest.aidl"/>
     </issue>
diff --git a/leanback/leanback-preference/lint-baseline.xml b/leanback/leanback-preference/lint-baseline.xml
index c24d1486..e254a45 100644
--- a/leanback/leanback-preference/lint-baseline.xml
+++ b/leanback/leanback-preference/lint-baseline.xml
@@ -1,32 +1,5 @@
 <?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">
-
-    <issue
-        id="MissingLeanbackLauncher"
-        message="Expecting an activity to have `android.intent.category.LEANBACK_LAUNCHER` intent filter"
-        errorLine1="&lt;manifest />"
-        errorLine2=" ~~~~~~~~">
-        <location
-            file="src/main/AndroidManifest.xml"/>
-    </issue>
-
-    <issue
-        id="ImpliedTouchscreenHardware"
-        message="Hardware feature `android.hardware.touchscreen` not explicitly marked as optional "
-        errorLine1="&lt;manifest />"
-        errorLine2=" ~~~~~~~~">
-        <location
-            file="src/main/AndroidManifest.xml"/>
-    </issue>
-
-    <issue
-        id="MissingLeanbackSupport"
-        message="Expecting `&lt;uses-feature android:name=&quot;android.software.leanback&quot; android:required=&quot;false&quot; />` tag"
-        errorLine1="&lt;manifest />"
-        errorLine2=" ~~~~~~~~">
-        <location
-            file="src/main/AndroidManifest.xml"/>
-    </issue>
+<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="UnknownNullness"
diff --git a/lint-checks/src/main/java/androidx/build/lint/PrereleaseSdkCoreDependencyDetector.kt b/lint-checks/src/main/java/androidx/build/lint/PrereleaseSdkCoreDependencyDetector.kt
index fc50974..c552ac5 100644
--- a/lint-checks/src/main/java/androidx/build/lint/PrereleaseSdkCoreDependencyDetector.kt
+++ b/lint-checks/src/main/java/androidx/build/lint/PrereleaseSdkCoreDependencyDetector.kt
@@ -47,6 +47,7 @@
             if (method.annotations.none { it.hasQualifiedName(PRERELEASE_SDK_CHECK) }) return
 
             // Check if the project is using a versioned dependency on core
+            @Suppress("DEPRECATION")
             val dependencies = context.project.buildVariant.mainArtifact.dependencies.getAll()
             if (dependencies.any { it.isInvalidCoreDependency() }) {
                 val incident = Incident(context)
diff --git a/media/media/lint-baseline.xml b/media/media/lint-baseline.xml
index de5add1..80dd31ec 100644
--- a/media/media/lint-baseline.xml
+++ b/media/media/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="RequireUnstableAidlAnnotation"
diff --git a/media/version-compat-tests/lib/lint-baseline.xml b/media/version-compat-tests/lib/lint-baseline.xml
index f34ae41..6ce321a 100644
--- a/media/version-compat-tests/lib/lint-baseline.xml
+++ b/media/version-compat-tests/lib/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="BanThreadSleep"
@@ -70,9 +70,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="82"
-            column="39"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -81,9 +79,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="82"
-            column="56"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -92,9 +88,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="96"
-            column="27"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -103,9 +97,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="96"
-            column="39"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -114,9 +106,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="96"
-            column="56"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -125,9 +115,7 @@
         errorLine1="    public static void waitFor(final PollingCheckCondition condition) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java"
-            line="76"
-            column="38"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java"/>
     </issue>
 
     <issue
@@ -136,9 +124,7 @@
         errorLine1="    public static void waitFor(long timeout, final PollingCheckCondition condition) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java"
-            line="90"
-            column="52"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java"/>
     </issue>
 
     <issue
@@ -147,9 +133,7 @@
         errorLine1="    public static void assertBundleEquals(Bundle expected, Bundle observed) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/TestUtil.java"
-            line="33"
-            column="43"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/TestUtil.java"/>
     </issue>
 
     <issue
@@ -158,9 +142,7 @@
         errorLine1="    public static void assertBundleEquals(Bundle expected, Bundle observed) {"
         errorLine2="                                                           ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/TestUtil.java"
-            line="33"
-            column="60"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/TestUtil.java"/>
     </issue>
 
 </issues>
diff --git a/media2/media2-session/lint-baseline.xml b/media2/media2-session/lint-baseline.xml
index bcb6051..a9dff846 100644
--- a/media2/media2-session/lint-baseline.xml
+++ b/media2/media2-session/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="WrongConstant"
@@ -38,6 +38,15 @@
     </issue>
 
     <issue
+        id="UnspecifiedRegisterReceiverFlag"
+        message="`mBroadcastReceiver` \&#xA;is missing `RECEIVER_EXPORTED` or `RECEIVER_NOT_EXPORTED` flag for unprotected \&#xA;broadcasts registered for android.intent.action.MEDIA_BUTTON"
+        errorLine1="                context.registerReceiver(mBroadcastReceiver, filter);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/media2/session/MediaSessionImplBase.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 void setTimeDiff(Long timeDiff) {"
diff --git a/media2/media2-session/version-compat-tests/common/lint-baseline.xml b/media2/media2-session/version-compat-tests/common/lint-baseline.xml
index 90b9f4e..2fad5d4 100644
--- a/media2/media2-session/version-compat-tests/common/lint-baseline.xml
+++ b/media2/media2-session/version-compat-tests/common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-alpha11" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-alpha11)" variant="all" version="8.1.0-alpha11">
+<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">
 
     <issue
         id="BanThreadSleep"
@@ -13,7 +13,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IRemoteMediaBrowserCompat {"
+        errorLine1=""
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/media2/test/common/IRemoteMediaBrowserCompat.aidl"/>
@@ -22,7 +22,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IRemoteMediaController {"
+        errorLine1=""
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/media2/test/common/IRemoteMediaController.aidl"/>
@@ -31,7 +31,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IRemoteMediaControllerCompat {"
+        errorLine1="    void create(String controllerId, in Bundle token, boolean waitForConnection);"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/media2/test/common/IRemoteMediaControllerCompat.aidl"/>
@@ -40,7 +40,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IRemoteMediaSession {"
+        errorLine1=""
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/media2/test/common/IRemoteMediaSession.aidl"/>
@@ -49,7 +49,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IRemoteMediaSessionCompat {"
+        errorLine1="// This is to avoid making dependency of testlib module on media library."
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/media2/test/common/IRemoteMediaSessionCompat.aidl"/>
diff --git a/mediarouter/mediarouter/lint-baseline.xml b/mediarouter/mediarouter/lint-baseline.xml
index 48e623c..db47a78 100644
--- a/mediarouter/mediarouter/lint-baseline.xml
+++ b/mediarouter/mediarouter/lint-baseline.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 27 (current min is 14): `android.app.Activity#setTurnScreenOn`"
-        errorLine1="        setTurnScreenOn(true);"
-        errorLine2="        ~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/mediarouter/media/MediaRouter2TestActivity.java"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 27 (current min is 14): `android.app.Activity#setShowWhenLocked`"
-        errorLine1="        setShowWhenLocked(true);"
-        errorLine2="        ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidTest/java/androidx/mediarouter/media/MediaRouter2TestActivity.java"/>
-    </issue>
+<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="BanThreadSleep"
@@ -92,12 +74,12 @@
     </issue>
 
     <issue
-        id="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="        if (BuildCompat.isAtLeastU()) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
+        id="UnspecifiedRegisterReceiverFlag"
+        message="`mActionReceiver` \&#xA;is missing `RECEIVER_EXPORTED` or `RECEIVER_NOT_EXPORTED` flag for unprotected \&#xA;broadcasts registered for androidx.mediarouter.media.actions.ACTION_ITEM_STATUS_CHANGED, androidx.mediarouter.media.actions.ACTION_SESSION_STATUS_CHANGED, androidx.mediarouter.media.actions.ACTION_MESSAGE_RECEIVED"
+        errorLine1="            context.registerReceiver(mActionReceiver, actionFilter);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java"/>
+            file="src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java"/>
     </issue>
 
 </issues>
diff --git a/metrics/integration-tests/janktest/lint-baseline.xml b/metrics/integration-tests/janktest/lint-baseline.xml
index 6a22b28..ff0820d 100644
--- a/metrics/integration-tests/janktest/lint-baseline.xml
+++ b/metrics/integration-tests/janktest/lint-baseline.xml
@@ -1,5 +1,23 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(1000)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(eventTime - now - 10);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/swipe/ManualSwipeInjector.java"/>
+    </issue>
 
     <issue
         id="BanThreadSleep"
diff --git a/navigation/navigation-common/lint-baseline.xml b/navigation/navigation-common/lint-baseline.xml
new file mode 100644
index 0000000..b2e8e58
--- /dev/null
+++ b/navigation/navigation-common/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="NewApi"
+        message="Call requires API level 21 (current min is 14): `android.os.BaseBundle#get`"
+        errorLine1="        if (!isNullable &amp;&amp; bundle.containsKey(name) &amp;&amp; bundle[name] == null) {"
+        errorLine2="                                                                    ~~">
+        <location
+            file="src/main/java/androidx/navigation/NavArgument.kt"/>
+    </issue>
+
+</issues>
diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/lint-baseline.xml b/navigation/navigation-compose/integration-tests/navigation-demos/lint-baseline.xml
new file mode 100644
index 0000000..a83a35d
--- /dev/null
+++ b/navigation/navigation-compose/integration-tests/navigation-demos/lint-baseline.xml
@@ -0,0 +1,40 @@
+<?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">
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(250)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/tooling/ComposeViewAdapterTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(200)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/tooling/ComposeViewAdapterTest.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor InfiniteTransitionClock has parameter &apos;maxDuration&apos; with type Function0&lt;Long>."
+        errorLine1="    private val maxDuration: () -> Long = { 0 }"
+        errorLine2="                             ~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/clock/InfiniteTransitionClock.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;getDp&apos; with type Function1&lt;? super Object, ? extends Dp>."
+        errorLine1="    fun getDp(par: Any): Dp? {"
+        errorLine2="    ^">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/clock/Utils.kt"/>
+    </issue>
+
+</issues>
diff --git a/paging/paging-compose/integration-tests/paging-demos/lint-baseline.xml b/paging/paging-compose/integration-tests/paging-demos/lint-baseline.xml
new file mode 100644
index 0000000..a83a35d
--- /dev/null
+++ b/paging/paging-compose/integration-tests/paging-demos/lint-baseline.xml
@@ -0,0 +1,40 @@
+<?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">
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(250)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/tooling/ComposeViewAdapterTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(200)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/tooling/ComposeViewAdapterTest.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor InfiniteTransitionClock has parameter &apos;maxDuration&apos; with type Function0&lt;Long>."
+        errorLine1="    private val maxDuration: () -> Long = { 0 }"
+        errorLine2="                             ~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/clock/InfiniteTransitionClock.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;getDp&apos; with type Function1&lt;? super Object, ? extends Dp>."
+        errorLine1="    fun getDp(par: Any): Dp? {"
+        errorLine2="    ^">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/ui/tooling/animation/clock/Utils.kt"/>
+    </issue>
+
+</issues>
diff --git a/playground-common/androidx-shared.properties b/playground-common/androidx-shared.properties
index e4ec300..2f085d2 100644
--- a/playground-common/androidx-shared.properties
+++ b/playground-common/androidx-shared.properties
@@ -59,7 +59,7 @@
 
 # Disallow resolving dependencies at configuration time, which is a slight performance problem
 android.dependencyResolutionAtConfigurationTime.disallow=true
-android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.dependencyResolutionAtConfigurationTime.disallow,android.experimental.lint.missingBaselineIsEmptyBaseline,android.lint.printStackTrace,android.experimental.disableCompileSdkChecks,android.overrideVersionCheck,android.r8.maxWorkers
+android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.dependencyResolutionAtConfigurationTime.disallow,android.experimental.lint.missingBaselineIsEmptyBaseline,android.lint.printStackTrace,android.lint.baselineOmitLineNumbers,android.experimental.disableCompileSdkChecks,android.overrideVersionCheck,android.r8.maxWorkers
 # Workaround for b/162074215
 android.includeDependencyInfoInApks=false
 
diff --git a/privacysandbox/ads/ads-adservices/lint-baseline.xml b/privacysandbox/ads/ads-adservices/lint-baseline.xml
new file mode 100644
index 0000000..872f5d8
--- /dev/null
+++ b/privacysandbox/ads/ads-adservices/lint-baseline.xml
@@ -0,0 +1,76 @@
+<?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/sdkruntime/sdkruntime-client/lint-baseline.xml b/privacysandbox/sdkruntime/sdkruntime-client/lint-baseline.xml
index 76eb91f..61827de 100644
--- a/privacysandbox/sdkruntime/sdkruntime-client/lint-baseline.xml
+++ b/privacysandbox/sdkruntime/sdkruntime-client/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="BanThreadSleep"
@@ -20,10 +20,46 @@
     </issue>
 
     <issue
-        id="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="            return if (BuildCompat.isAtLeastU() || AdServicesInfo.isDeveloperPreview()) {"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~">
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.client.SdkSandboxManagerCompat.ApiAdServicesV4Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="            sdkSandboxManager.unloadSdk(sdkName)"
+        errorLine2="                              ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/client/SdkSandboxManagerCompat.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.client.SdkSandboxManagerCompat.ApiAdServicesV4Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="                sdkSandboxManager.addSdkSandboxProcessDeathCallback(callbackExecutor, delegate)"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/client/SdkSandboxManagerCompat.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.client.SdkSandboxManagerCompat.ApiAdServicesV4Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="                        sdkSandboxManager.removeSdkSandboxProcessDeathCallback(delegate)"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/client/SdkSandboxManagerCompat.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.client.SdkSandboxManagerCompat.ApiAdServicesV4Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="                sdkSandboxManager.loadSdk("
+        errorLine2="                                  ~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/client/SdkSandboxManagerCompat.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.client.SdkSandboxManagerCompat.ApiAdServicesV5Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="                .sandboxedSdks"
+        errorLine2="                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/privacysandbox/sdkruntime/client/SdkSandboxManagerCompat.kt"/>
     </issue>
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/lint-baseline.xml b/privacysandbox/sdkruntime/sdkruntime-core/lint-baseline.xml
index 144f0b3..3f6432a 100644
--- a/privacysandbox/sdkruntime/sdkruntime-core/lint-baseline.xml
+++ b/privacysandbox/sdkruntime/sdkruntime-core/lint-baseline.xml
@@ -1,13 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="PrereleaseSdkCoreDependency"
-        message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
-        errorLine1="                if (BuildCompat.isAtLeastU() || AdServicesInfo.isDeveloperPreview()) {"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~">
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.LoadSdkCompatException.ApiAdServicesV4Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="            return LoadSdkException("
+        errorLine2="                   ^">
         <location
-            file="src/main/java/androidx/privacysandbox/sdkruntime/core/controller/SdkSandboxControllerCompat.kt"/>
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/LoadSdkCompatException.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.LoadSdkCompatException.ApiAdServicesV4Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="                toLoadSdkErrorCodeCompat(ex.loadSdkErrorCode),"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/LoadSdkCompatException.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.LoadSdkCompatException.ApiAdServicesV4Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="                ex.extraInformation"
+        errorLine2="                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/LoadSdkCompatException.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.controller.impl.PlatformImpl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="            .sandboxedSdks"
+        errorLine2="             ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/controller/impl/PlatformImpl.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.SandboxedSdkCompat.ApiAdServicesV4Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="            return sandboxedSdk.getInterface()"
+        errorLine2="                                ~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkCompat.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.SandboxedSdkCompat.ApiAdServicesV4Impl.Companion is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="                return SandboxedSdk(sdkInterface)"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkCompat.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.SandboxedSdkCompat.ApiAdServicesV5Impl is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="            val sharedLibraryInfo = sandboxedSdk.sharedLibraryInfo"
+        errorLine2="                                                 ~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkCompat.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.SandboxedSdkProviderAdapter is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1=") : SandboxedSdkProvider() {"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkProviderAdapter.kt"/>
+    </issue>
+
+    <issue
+        id="ClassVerificationFailure"
+        message="This call references a method added in API level 34; however, the containing class androidx.privacysandbox.sdkruntime.core.SandboxedSdkProviderAdapter is reachable from earlier API levels and will fail run-time class verification."
+        errorLine1="        val currentContext = context!!"
+        errorLine2="                             ~~~~~~~">
+        <location
+            file="src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkProviderAdapter.kt"/>
     </issue>
 
 </issues>
diff --git a/privacysandbox/ui/integration-tests/testaidl/lint-baseline.xml b/privacysandbox/ui/integration-tests/testaidl/lint-baseline.xml
index 2af7694..53c1983 100644
--- a/privacysandbox/ui/integration-tests/testaidl/lint-baseline.xml
+++ b/privacysandbox/ui/integration-tests/testaidl/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="RequireUnstableAidlAnnotation"
diff --git a/privacysandbox/ui/integration-tests/testsdkprovider/lint-baseline.xml b/privacysandbox/ui/integration-tests/testsdkprovider/lint-baseline.xml
new file mode 100644
index 0000000..dbc4c7b
--- /dev/null
+++ b/privacysandbox/ui/integration-tests/testsdkprovider/lint-baseline.xml
@@ -0,0 +1,31 @@
+<?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.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/privacysandbox/ui/ui-core/lint-baseline.xml b/privacysandbox/ui/ui-core/lint-baseline.xml
index c41336f..e00c3bf 100644
--- a/privacysandbox/ui/ui-core/lint-baseline.xml
+++ b/privacysandbox/ui/ui-core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="RequireUnstableAidlAnnotation"
@@ -13,7 +13,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IRemoteSessionController {"
+        errorLine1="    void notifyResized(int width, int height);"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/privacysandbox/ui/core/IRemoteSessionController.aidl"/>
@@ -22,7 +22,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface ISandboxedUiAdapter {"
+        errorLine1="import android.content.Context;"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/privacysandbox/ui/core/ISandboxedUiAdapter.aidl"/>
diff --git a/room/integration-tests/testapp/lint-baseline.xml b/room/integration-tests/testapp/lint-baseline.xml
index aa5386e..2867962 100644
--- a/room/integration-tests/testapp/lint-baseline.xml
+++ b/room/integration-tests/testapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
         id="NewApi"
diff --git a/room/room-rxjava2/lint-baseline.xml b/room/room-rxjava2/lint-baseline.xml
index 656b9b3..3d87c11 100644
--- a/room/room-rxjava2/lint-baseline.xml
+++ b/room/room-rxjava2/lint-baseline.xml
@@ -1,5 +1,6 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+
     <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"
diff --git a/samples/AndroidXDemos/lint-baseline.xml b/samples/AndroidXDemos/lint-baseline.xml
index ac89c9e..7b8bf98 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.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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="OnClick"
@@ -293,6 +293,24 @@
     </issue>
 
     <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(1000)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(eventTime - now - 10);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/swipe/ManualSwipeInjector.java"/>
+    </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()"
diff --git a/samples/MediaRoutingDemo/lint-baseline.xml b/samples/MediaRoutingDemo/lint-baseline.xml
new file mode 100644
index 0000000..af8264e2
--- /dev/null
+++ b/samples/MediaRoutingDemo/lint-baseline.xml
@@ -0,0 +1,22 @@
+<?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="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(1000)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(eventTime - now - 10);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/swipe/ManualSwipeInjector.java"/>
+    </issue>
+
+</issues>
diff --git a/samples/Support4Demos/lint-baseline.xml b/samples/Support4Demos/lint-baseline.xml
index 06c6971..8d63c2f 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.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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
     <issue
         id="MissingPermission"
@@ -164,6 +164,15 @@
     </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);"
+        errorLine2="                         ~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
+    </issue>
+
+    <issue
         id="MetadataTagInsideApplicationTag"
         message="Detected &lt;application>-level meta-data tag."
         errorLine1="        &lt;meta-data"
@@ -182,6 +191,15 @@
     </issue>
 
     <issue
+        id="UnspecifiedRegisterReceiverFlag"
+        message="`this` \&#xA;is missing `RECEIVER_EXPORTED` or `RECEIVER_NOT_EXPORTED` flag for unprotected \&#xA;broadcasts registered for com.example.android.supportv4.media.next, com.example.android.supportv4.media.pause, com.example.android.supportv4.media.play, com.example.android.supportv4.media.prev"
+        errorLine1="                mService.registerReceiver(this, filter);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
+    </issue>
+
+    <issue
         id="UnspecifiedImmutableFlag"
         message="Missing `PendingIntent` mutability flag"
         errorLine1="                        GET_INTENT_SENDER_CODE, intent, 0);"
diff --git a/samples/SupportContentDemos/lint-baseline.xml b/samples/SupportContentDemos/lint-baseline.xml
index 260f1e9..5517894 100644
--- a/samples/SupportContentDemos/lint-baseline.xml
+++ b/samples/SupportContentDemos/lint-baseline.xml
@@ -1,5 +1,23 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(1000)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="                Thread.sleep(eventTime - now - 10);"
+        errorLine2="                       ~~~~~">
+        <location
+            file="src/androidTest/java/androidx/viewpager2/widget/swipe/ManualSwipeInjector.java"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/samples/SupportWearDemos/lint-baseline.xml b/samples/SupportWearDemos/lint-baseline.xml
index cfbc3a4..2098c9c 100644
--- a/samples/SupportWearDemos/lint-baseline.xml
+++ b/samples/SupportWearDemos/lint-baseline.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha08" type="baseline" client="cli" dependencies="false" name="AGP (7.4.0-alpha08)" variant="all" version="7.4.0-alpha08">
+<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="WearStandaloneAppFlag"
+        message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
+        errorLine1="    &lt;application"
+        errorLine2="     ~~~~~~~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/tracing/tracing-perfetto/lint-baseline.xml b/tracing/tracing-perfetto/lint-baseline.xml
deleted file mode 100644
index 37fd893..0000000
--- a/tracing/tracing-perfetto/lint-baseline.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-
-    <issue
-        id="EnsureInitializerMetadata"
-        message="Every Initializer needs to be accompanied by a corresponding &lt;meta-data> entry in the AndroidManifest.xml file.">
-        <location
-            file="src/main/java/androidx/tracing/perfetto/StartupTracingInitializer.kt"/>
-    </issue>
-
-</issues>
diff --git a/tv/tv-foundation/lint-baseline.xml b/tv/tv-foundation/lint-baseline.xml
index ce0447e..be63ad3 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.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="BanThreadSleep"
@@ -273,24 +273,6 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;var72d50710&apos; with type Function2&lt;? super TvLazyGridItemSpanScope, ? super Integer, ? extends TvGridItemSpan>."
-        errorLine1="                span = span?.let { { span() } } ?: DefaultSpan,"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;vara1157cff&apos; with type Function2&lt;? super TvLazyGridItemSpanScope, ? super Integer, ? extends TvGridItemSpan>."
-        errorLine1="                span = span ?: DefaultSpan,"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/tv/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt"/>
-    </issue>
-
-    <issue
-        id="PrimitiveInLambda"
         message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;TvLazyGridItemSpanScope, Integer, TvGridItemSpan> of &apos;getDefaultSpan&apos;."
         errorLine1="        val DefaultSpan: TvLazyGridItemSpanScope.(Int) -> TvGridItemSpan ="
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
diff --git a/wear/compose/compose-material/lint-baseline.xml b/wear/compose/compose-material/lint-baseline.xml
index c490fad..3ebc76a 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.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="PrimitiveInLambda"
@@ -39,7 +39,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Picker has parameter &apos;option&apos; with type Function2&lt;? super PickerScope, ? super Integer, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Picker has parameter &apos;option&apos; with type Function2&lt;? super PickerScope, ? super Integer, Unit>."
         errorLine1="    option: @Composable PickerScope.(optionIndex: Int) -> Unit"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -48,7 +48,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Picker has parameter &apos;option&apos; with type Function2&lt;? super PickerScope, ? super Integer, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Picker has parameter &apos;option&apos; with type Function2&lt;? super PickerScope, ? super Integer, Unit>."
         errorLine1="    option: @Composable PickerScope.(optionIndex: Int) -> Unit"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -318,7 +318,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Stepper has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Stepper has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
         errorLine1="    onValueChange: (Float) -> Unit,"
         errorLine2="                   ~~~~~~~~~~~~~~~">
         <location
@@ -327,7 +327,7 @@
 
     <issue
         id="PrimitiveInLambda"
-        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Stepper has parameter &apos;onValueChange&apos; with type Function1&lt;? super Integer, ? extends Unit>."
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Stepper has parameter &apos;onValueChange&apos; with type Function1&lt;? super Integer, Unit>."
         errorLine1="    onValueChange: (Int) -> Unit,"
         errorLine2="                   ~~~~~~~~~~~~~">
         <location
diff --git a/wear/compose/compose-material3/integration-tests/lint-baseline.xml b/wear/compose/compose-material3/integration-tests/lint-baseline.xml
new file mode 100644
index 0000000..8d5f8b9
--- /dev/null
+++ b/wear/compose/compose-material3/integration-tests/lint-baseline.xml
@@ -0,0 +1,553 @@
+<?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">
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/BottomNavigationScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/ButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/CheckboxScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/FloatingActionButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/NavigationRailScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="    Thread.sleep(1)"
+        errorLine2="           ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/ObservableThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/TabScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    internal val positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function1&lt;Float, Float> of &apos;getPositionalThreshold$lint_module&apos;."
+        errorLine1="    internal val positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="    internal val velocityThreshold: () -> Float,"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function0&lt;Float> of &apos;getVelocityThreshold$lint_module&apos;."
+        errorLine1="    internal val velocityThreshold: () -> Float,"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="        positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="        velocityThreshold: () -> Float,"
+        errorLine2="                           ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="            positionalThreshold: (distance: Float) -> Float,"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="            velocityThreshold: () -> Float,"
+        errorLine2="                               ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;calculateBackLayerConstraints&apos; with type Function1&lt;? super Constraints, ? extends Constraints>."
+        errorLine1="    val calculateBackLayerConstraints: (Constraints) -> Constraints = {"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BackdropStack has parameter &apos;calculateBackLayerConstraints&apos; with type Function1&lt;? super Constraints, Constraints>."
+        errorLine1="    calculateBackLayerConstraints: (Constraints) -> Constraints,"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BackdropStack has parameter &apos;frontLayer&apos; with type Function2&lt;? super Constraints, ? super Float, Unit>."
+        errorLine1="    frontLayer: @Composable @UiComposable (Constraints, Float) -> Unit"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomNavigationTransition has parameter &apos;content&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    content: @Composable (animationProgress: Float) -> Unit"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomNavigation.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheet has parameter &apos;calculateAnchors&apos; with type Function1&lt;? super IntSize, ? extends DraggableAnchors&lt;BottomSheetValue>>."
+        errorLine1="    calculateAnchors: (sheetSize: IntSize) -> DraggableAnchors&lt;BottomSheetValue>,"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;bottomSheet&apos; with type Function1&lt;? super Integer, Unit>."
+        errorLine1="    bottomSheet: @Composable (layoutHeight: Int) -> Unit,"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;sheetOffset&apos; with type Function0&lt;Float>."
+        errorLine1="    sheetOffset: () -> Float,"
+        errorLine2="                 ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method awaitHorizontalPointerSlopOrCancellation has parameter &apos;onPointerSlopReached&apos; with type Function2&lt;? super PointerInputChange, ? super Float, Unit>."
+        errorLine1="    onPointerSlopReached: (change: PointerInputChange, overSlop: Float) -> Unit"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/DragGestureDetectorCopy.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Scrim has parameter &apos;fraction&apos; with type Function0&lt;Float>."
+        errorLine1="    fraction: () -> Float,"
+        errorLine2="              ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Drawer.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method updateHeight has parameter &apos;onHeightUpdate&apos; with type Function1&lt;? super Integer, Unit>."
+        errorLine1="    onHeightUpdate: (Int) -> Unit"
+        errorLine2="                    ~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/material/ExposedDropdownMenu.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method NavigationRailTransition has parameter &apos;content&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    content: @Composable (animationProgress: Float) -> Unit"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/NavigationRail.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method OutlinedTextFieldLayout has parameter &apos;onLabelMeasured&apos; with type Function1&lt;? super Size, Unit>."
+        errorLine1="    onLabelMeasured: (Size) -> Unit,"
+        errorLine2="                     ~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor OutlinedTextFieldMeasurePolicy has parameter &apos;onLabelMeasured&apos; with type Function1&lt;? super Size, Unit>."
+        errorLine1="    private val onLabelMeasured: (Size) -> Unit,"
+        errorLine2="                                 ~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicWidth has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicHeight has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method pullRefresh has parameter &apos;onPull&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    onPull: (pullDelta: Float) -> Float,"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method pullRefresh has parameter &apos;onRelease&apos; with type Function2&lt;? super Float, ? super Continuation&lt;? super Float>, ? extends Object>."
+        errorLine1="    onRelease: suspend (flingVelocity: Float) -> Float,"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor PullRefreshNestedScrollConnection has parameter &apos;onPull&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    private val onPull: (pullDelta: Float) -> Float,"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor PullRefreshNestedScrollConnection has parameter &apos;onRelease&apos; with type Function2&lt;? super Float, ? super Continuation&lt;? super Float>, ? extends Object>."
+        errorLine1="    private val onRelease: suspend (flingVelocity: Float) -> Float,"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Slider has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    onValueChange: (Float) -> Unit,"
+        errorLine2="                   ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToUserValue&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToUserValue(offset: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToOffset&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToOffset(userValue: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToOffset&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToOffset(userValue: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;postPointerSlop&apos; with type Function2&lt;? super PointerInputChange, ? super Float, ? extends Unit>."
+        errorLine1="    val postPointerSlop = { pointerInput: PointerInputChange, offset: Float ->"
+        errorLine2="    ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method CorrectValueSideEffect has parameter &apos;scaleToOffset&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    scaleToOffset: (Float) -> Float,"
+        errorLine2="                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method sliderSemantics has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    onValueChange: (Float) -> Unit,"
+        errorLine2="                   ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type State&lt;Function2&lt;Boolean, Float, Unit>> of &apos;getOnDrag&apos;."
+        errorLine1="    val onDrag: State&lt;(Boolean, Float) -> Unit>,"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor SliderDraggableState has parameter &apos;onDelta&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    val onDelta: (Float) -> Unit"
+        errorLine2="                 ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function1&lt;Float, Unit> of &apos;getOnDelta&apos;."
+        errorLine1="    val onDelta: (Float) -> Unit"
+        errorLine2="                 ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method setThresholds$lint_module has parameter &apos;&lt;set-?>&apos; with type Function2&lt;? super Float, ? super Float, Float>."
+        errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Float, Float, Float> of &apos;getThresholds$lint_module&apos;."
+        errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method computeTarget has parameter &apos;thresholds&apos; with type Function2&lt;? super Float, ? super Float, Float>."
+        errorLine1="    thresholds: (Float, Float) -> Float,"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method SwitchImpl has parameter &apos;thumbValue&apos; with type Function0&lt;Float>."
+        errorLine1="    thumbValue: () -> Float,"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Switch.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicWidth has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicHeight has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;labelColor&apos; with type Function1&lt;? super InputPhase, ? extends Color>."
+        errorLine1="    val labelColor: @Composable (InputPhase) -> Color = {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Transition has parameter &apos;contentColor&apos; with type Function1&lt;? super InputPhase, Color>."
+        errorLine1="        contentColor: @Composable (InputPhase) -> Color,"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Transition has parameter &apos;content&apos; with type Function4&lt;? super Float, ? super Color, ? super Color, ? super Float, Unit>."
+        errorLine1="        content: @Composable ("
+        errorLine2="                 ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+</issues>
diff --git a/wear/compose/integration-tests/demos/lint-baseline.xml b/wear/compose/integration-tests/demos/lint-baseline.xml
index 505db87..f9c7dbf 100644
--- a/wear/compose/integration-tests/demos/lint-baseline.xml
+++ b/wear/compose/integration-tests/demos/lint-baseline.xml
@@ -1,5 +1,356 @@
 <?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.2.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+
+    <issue
+        id="WearStandaloneAppFlag"
+        message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
+        errorLine1="    &lt;application"
+        errorLine2="     ~~~~~~~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/BottomNavigationScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/ButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/CheckboxScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/FloatingActionButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/NavigationRailScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="    Thread.sleep(1)"
+        errorLine2="           ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/ObservableThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/TabScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    internal val positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function1&lt;Float, Float> of &apos;getPositionalThreshold$lint_module&apos;."
+        errorLine1="    internal val positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="    internal val velocityThreshold: () -> Float,"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function0&lt;Float> of &apos;getVelocityThreshold$lint_module&apos;."
+        errorLine1="    internal val velocityThreshold: () -> Float,"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="        positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="        velocityThreshold: () -> Float,"
+        errorLine2="                           ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="            positionalThreshold: (distance: Float) -> Float,"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="            velocityThreshold: () -> Float,"
+        errorLine2="                               ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;calculateBackLayerConstraints&apos; with type Function1&lt;? super Constraints, ? extends Constraints>."
+        errorLine1="    val calculateBackLayerConstraints: (Constraints) -> Constraints = {"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BackdropStack has parameter &apos;calculateBackLayerConstraints&apos; with type Function1&lt;? super Constraints, Constraints>."
+        errorLine1="    calculateBackLayerConstraints: (Constraints) -> Constraints,"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BackdropStack has parameter &apos;frontLayer&apos; with type Function2&lt;? super Constraints, ? super Float, Unit>."
+        errorLine1="    frontLayer: @Composable @UiComposable (Constraints, Float) -> Unit"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomNavigationTransition has parameter &apos;content&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    content: @Composable (animationProgress: Float) -> Unit"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomNavigation.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheet has parameter &apos;calculateAnchors&apos; with type Function1&lt;? super IntSize, ? extends DraggableAnchors&lt;BottomSheetValue>>."
+        errorLine1="    calculateAnchors: (sheetSize: IntSize) -> DraggableAnchors&lt;BottomSheetValue>,"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;bottomSheet&apos; with type Function1&lt;? super Integer, Unit>."
+        errorLine1="    bottomSheet: @Composable (layoutHeight: Int) -> Unit,"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;sheetOffset&apos; with type Function0&lt;Float>."
+        errorLine1="    sheetOffset: () -> Float,"
+        errorLine2="                 ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method awaitHorizontalPointerSlopOrCancellation has parameter &apos;onPointerSlopReached&apos; with type Function2&lt;? super PointerInputChange, ? super Float, Unit>."
+        errorLine1="    onPointerSlopReached: (change: PointerInputChange, overSlop: Float) -> Unit"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/DragGestureDetectorCopy.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Scrim has parameter &apos;fraction&apos; with type Function0&lt;Float>."
+        errorLine1="    fraction: () -> Float,"
+        errorLine2="              ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Drawer.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method updateHeight has parameter &apos;onHeightUpdate&apos; with type Function1&lt;? super Integer, Unit>."
+        errorLine1="    onHeightUpdate: (Int) -> Unit"
+        errorLine2="                    ~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/material/ExposedDropdownMenu.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method NavigationRailTransition has parameter &apos;content&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    content: @Composable (animationProgress: Float) -> Unit"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/NavigationRail.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method OutlinedTextFieldLayout has parameter &apos;onLabelMeasured&apos; with type Function1&lt;? super Size, Unit>."
+        errorLine1="    onLabelMeasured: (Size) -> Unit,"
+        errorLine2="                     ~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor OutlinedTextFieldMeasurePolicy has parameter &apos;onLabelMeasured&apos; with type Function1&lt;? super Size, Unit>."
+        errorLine1="    private val onLabelMeasured: (Size) -> Unit,"
+        errorLine2="                                 ~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicWidth has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicHeight has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
 
     <issue
         id="PrimitiveInLambda"
@@ -39,6 +390,132 @@
 
     <issue
         id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method pullRefresh has parameter &apos;onPull&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    onPull: (pullDelta: Float) -> Float,"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method pullRefresh has parameter &apos;onRelease&apos; with type Function2&lt;? super Float, ? super Continuation&lt;? super Float>, ? extends Object>."
+        errorLine1="    onRelease: suspend (flingVelocity: Float) -> Float,"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor PullRefreshNestedScrollConnection has parameter &apos;onPull&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    private val onPull: (pullDelta: Float) -> Float,"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor PullRefreshNestedScrollConnection has parameter &apos;onRelease&apos; with type Function2&lt;? super Float, ? super Continuation&lt;? super Float>, ? extends Object>."
+        errorLine1="    private val onRelease: suspend (flingVelocity: Float) -> Float,"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Slider has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    onValueChange: (Float) -> Unit,"
+        errorLine2="                   ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToUserValue&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToUserValue(offset: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToOffset&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToOffset(userValue: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToOffset&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToOffset(userValue: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;postPointerSlop&apos; with type Function2&lt;? super PointerInputChange, ? super Float, ? extends Unit>."
+        errorLine1="    val postPointerSlop = { pointerInput: PointerInputChange, offset: Float ->"
+        errorLine2="    ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method CorrectValueSideEffect has parameter &apos;scaleToOffset&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    scaleToOffset: (Float) -> Float,"
+        errorLine2="                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method sliderSemantics has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    onValueChange: (Float) -> Unit,"
+        errorLine2="                   ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type State&lt;Function2&lt;Boolean, Float, Unit>> of &apos;getOnDrag&apos;."
+        errorLine1="    val onDrag: State&lt;(Boolean, Float) -> Unit>,"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor SliderDraggableState has parameter &apos;onDelta&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    val onDelta: (Float) -> Unit"
+        errorLine2="                 ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function1&lt;Float, Unit> of &apos;getOnDelta&apos;."
+        errorLine1="    val onDelta: (Float) -> Unit"
+        errorLine2="                 ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
         message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method DefaultInlineSlider has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
         errorLine1="    onValueChange: (Float) -> Unit,"
         errorLine2="                   ~~~~~~~~~~~~~~~">
@@ -55,4 +532,85 @@
             file="src/main/java/androidx/wear/compose/integration/demos/SliderDemo.kt"/>
     </issue>
 
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method setThresholds$lint_module has parameter &apos;&lt;set-?>&apos; with type Function2&lt;? super Float, ? super Float, Float>."
+        errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Float, Float, Float> of &apos;getThresholds$lint_module&apos;."
+        errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method computeTarget has parameter &apos;thresholds&apos; with type Function2&lt;? super Float, ? super Float, Float>."
+        errorLine1="    thresholds: (Float, Float) -> Float,"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method SwitchImpl has parameter &apos;thumbValue&apos; with type Function0&lt;Float>."
+        errorLine1="    thumbValue: () -> Float,"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Switch.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicWidth has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicHeight has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;labelColor&apos; with type Function1&lt;? super InputPhase, ? extends Color>."
+        errorLine1="    val labelColor: @Composable (InputPhase) -> Color = {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Transition has parameter &apos;contentColor&apos; with type Function1&lt;? super InputPhase, Color>."
+        errorLine1="        contentColor: @Composable (InputPhase) -> Color,"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Transition has parameter &apos;content&apos; with type Function4&lt;? super Float, ? super Color, ? super Color, ? super Float, Unit>."
+        errorLine1="        content: @Composable ("
+        errorLine2="                 ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
 </issues>
diff --git a/wear/compose/integration-tests/macrobenchmark-target/lint-baseline.xml b/wear/compose/integration-tests/macrobenchmark-target/lint-baseline.xml
new file mode 100644
index 0000000..fb6ce31
--- /dev/null
+++ b/wear/compose/integration-tests/macrobenchmark-target/lint-baseline.xml
@@ -0,0 +1,553 @@
+<?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="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/BottomNavigationScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/ButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/CheckboxScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/FloatingActionButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/NavigationRailScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="    Thread.sleep(1)"
+        errorLine2="           ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/ObservableThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/TabScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    internal val positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function1&lt;Float, Float> of &apos;getPositionalThreshold$lint_module&apos;."
+        errorLine1="    internal val positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="    internal val velocityThreshold: () -> Float,"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function0&lt;Float> of &apos;getVelocityThreshold$lint_module&apos;."
+        errorLine1="    internal val velocityThreshold: () -> Float,"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="        positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="        velocityThreshold: () -> Float,"
+        errorLine2="                           ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="            positionalThreshold: (distance: Float) -> Float,"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="            velocityThreshold: () -> Float,"
+        errorLine2="                               ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;calculateBackLayerConstraints&apos; with type Function1&lt;? super Constraints, ? extends Constraints>."
+        errorLine1="    val calculateBackLayerConstraints: (Constraints) -> Constraints = {"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BackdropStack has parameter &apos;calculateBackLayerConstraints&apos; with type Function1&lt;? super Constraints, Constraints>."
+        errorLine1="    calculateBackLayerConstraints: (Constraints) -> Constraints,"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BackdropStack has parameter &apos;frontLayer&apos; with type Function2&lt;? super Constraints, ? super Float, Unit>."
+        errorLine1="    frontLayer: @Composable @UiComposable (Constraints, Float) -> Unit"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomNavigationTransition has parameter &apos;content&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    content: @Composable (animationProgress: Float) -> Unit"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomNavigation.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheet has parameter &apos;calculateAnchors&apos; with type Function1&lt;? super IntSize, ? extends DraggableAnchors&lt;BottomSheetValue>>."
+        errorLine1="    calculateAnchors: (sheetSize: IntSize) -> DraggableAnchors&lt;BottomSheetValue>,"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;bottomSheet&apos; with type Function1&lt;? super Integer, Unit>."
+        errorLine1="    bottomSheet: @Composable (layoutHeight: Int) -> Unit,"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;sheetOffset&apos; with type Function0&lt;Float>."
+        errorLine1="    sheetOffset: () -> Float,"
+        errorLine2="                 ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method awaitHorizontalPointerSlopOrCancellation has parameter &apos;onPointerSlopReached&apos; with type Function2&lt;? super PointerInputChange, ? super Float, Unit>."
+        errorLine1="    onPointerSlopReached: (change: PointerInputChange, overSlop: Float) -> Unit"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/DragGestureDetectorCopy.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Scrim has parameter &apos;fraction&apos; with type Function0&lt;Float>."
+        errorLine1="    fraction: () -> Float,"
+        errorLine2="              ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Drawer.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method updateHeight has parameter &apos;onHeightUpdate&apos; with type Function1&lt;? super Integer, Unit>."
+        errorLine1="    onHeightUpdate: (Int) -> Unit"
+        errorLine2="                    ~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/material/ExposedDropdownMenu.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method NavigationRailTransition has parameter &apos;content&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    content: @Composable (animationProgress: Float) -> Unit"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/NavigationRail.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method OutlinedTextFieldLayout has parameter &apos;onLabelMeasured&apos; with type Function1&lt;? super Size, Unit>."
+        errorLine1="    onLabelMeasured: (Size) -> Unit,"
+        errorLine2="                     ~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor OutlinedTextFieldMeasurePolicy has parameter &apos;onLabelMeasured&apos; with type Function1&lt;? super Size, Unit>."
+        errorLine1="    private val onLabelMeasured: (Size) -> Unit,"
+        errorLine2="                                 ~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicWidth has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicHeight has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method pullRefresh has parameter &apos;onPull&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    onPull: (pullDelta: Float) -> Float,"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method pullRefresh has parameter &apos;onRelease&apos; with type Function2&lt;? super Float, ? super Continuation&lt;? super Float>, ? extends Object>."
+        errorLine1="    onRelease: suspend (flingVelocity: Float) -> Float,"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor PullRefreshNestedScrollConnection has parameter &apos;onPull&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    private val onPull: (pullDelta: Float) -> Float,"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor PullRefreshNestedScrollConnection has parameter &apos;onRelease&apos; with type Function2&lt;? super Float, ? super Continuation&lt;? super Float>, ? extends Object>."
+        errorLine1="    private val onRelease: suspend (flingVelocity: Float) -> Float,"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Slider has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    onValueChange: (Float) -> Unit,"
+        errorLine2="                   ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToUserValue&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToUserValue(offset: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToOffset&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToOffset(userValue: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToOffset&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToOffset(userValue: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;postPointerSlop&apos; with type Function2&lt;? super PointerInputChange, ? super Float, ? extends Unit>."
+        errorLine1="    val postPointerSlop = { pointerInput: PointerInputChange, offset: Float ->"
+        errorLine2="    ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method CorrectValueSideEffect has parameter &apos;scaleToOffset&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    scaleToOffset: (Float) -> Float,"
+        errorLine2="                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method sliderSemantics has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    onValueChange: (Float) -> Unit,"
+        errorLine2="                   ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type State&lt;Function2&lt;Boolean, Float, Unit>> of &apos;getOnDrag&apos;."
+        errorLine1="    val onDrag: State&lt;(Boolean, Float) -> Unit>,"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor SliderDraggableState has parameter &apos;onDelta&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    val onDelta: (Float) -> Unit"
+        errorLine2="                 ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function1&lt;Float, Unit> of &apos;getOnDelta&apos;."
+        errorLine1="    val onDelta: (Float) -> Unit"
+        errorLine2="                 ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method setThresholds$lint_module has parameter &apos;&lt;set-?>&apos; with type Function2&lt;? super Float, ? super Float, Float>."
+        errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Float, Float, Float> of &apos;getThresholds$lint_module&apos;."
+        errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method computeTarget has parameter &apos;thresholds&apos; with type Function2&lt;? super Float, ? super Float, Float>."
+        errorLine1="    thresholds: (Float, Float) -> Float,"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method SwitchImpl has parameter &apos;thumbValue&apos; with type Function0&lt;Float>."
+        errorLine1="    thumbValue: () -> Float,"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Switch.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicWidth has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicHeight has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;labelColor&apos; with type Function1&lt;? super InputPhase, ? extends Color>."
+        errorLine1="    val labelColor: @Composable (InputPhase) -> Color = {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Transition has parameter &apos;contentColor&apos; with type Function1&lt;? super InputPhase, Color>."
+        errorLine1="        contentColor: @Composable (InputPhase) -> Color,"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Transition has parameter &apos;content&apos; with type Function4&lt;? super Float, ? super Color, ? super Color, ? super Float, Unit>."
+        errorLine1="        content: @Composable ("
+        errorLine2="                 ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+</issues>
diff --git a/wear/compose/integration-tests/navigation/lint-baseline.xml b/wear/compose/integration-tests/navigation/lint-baseline.xml
new file mode 100644
index 0000000..8d5f8b9
--- /dev/null
+++ b/wear/compose/integration-tests/navigation/lint-baseline.xml
@@ -0,0 +1,553 @@
+<?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">
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/BottomNavigationScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/ButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/CheckboxScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/FloatingActionButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/NavigationRailScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="    Thread.sleep(1)"
+        errorLine2="           ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/ObservableThemeTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/RadioButtonScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="        Thread.sleep(300)"
+        errorLine2="               ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/SwitchScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="BanThreadSleep"
+        message="Uses Thread.sleep()"
+        errorLine1="            Thread.sleep(300)"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/TabScreenshotTest.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    internal val positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function1&lt;Float, Float> of &apos;getPositionalThreshold$lint_module&apos;."
+        errorLine1="    internal val positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="    internal val velocityThreshold: () -> Float,"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function0&lt;Float> of &apos;getVelocityThreshold$lint_module&apos;."
+        errorLine1="    internal val velocityThreshold: () -> Float,"
+        errorLine2="                                    ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="        positionalThreshold: (totalDistance: Float) -> Float,"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AnchoredDraggableState has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="        velocityThreshold: () -> Float,"
+        errorLine2="                           ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;positionalThreshold&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="            positionalThreshold: (distance: Float) -> Float,"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Saver has parameter &apos;velocityThreshold&apos; with type Function0&lt;Float>."
+        errorLine1="            velocityThreshold: () -> Float,"
+        errorLine2="                               ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/AnchoredDraggable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;calculateBackLayerConstraints&apos; with type Function1&lt;? super Constraints, ? extends Constraints>."
+        errorLine1="    val calculateBackLayerConstraints: (Constraints) -> Constraints = {"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BackdropStack has parameter &apos;calculateBackLayerConstraints&apos; with type Function1&lt;? super Constraints, Constraints>."
+        errorLine1="    calculateBackLayerConstraints: (Constraints) -> Constraints,"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BackdropStack has parameter &apos;frontLayer&apos; with type Function2&lt;? super Constraints, ? super Float, Unit>."
+        errorLine1="    frontLayer: @Composable @UiComposable (Constraints, Float) -> Unit"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BackdropScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomNavigationTransition has parameter &apos;content&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    content: @Composable (animationProgress: Float) -> Unit"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomNavigation.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheet has parameter &apos;calculateAnchors&apos; with type Function1&lt;? super IntSize, ? extends DraggableAnchors&lt;BottomSheetValue>>."
+        errorLine1="    calculateAnchors: (sheetSize: IntSize) -> DraggableAnchors&lt;BottomSheetValue>,"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;bottomSheet&apos; with type Function1&lt;? super Integer, Unit>."
+        errorLine1="    bottomSheet: @Composable (layoutHeight: Int) -> Unit,"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method BottomSheetScaffoldLayout has parameter &apos;sheetOffset&apos; with type Function0&lt;Float>."
+        errorLine1="    sheetOffset: () -> Float,"
+        errorLine2="                 ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method awaitHorizontalPointerSlopOrCancellation has parameter &apos;onPointerSlopReached&apos; with type Function2&lt;? super PointerInputChange, ? super Float, Unit>."
+        errorLine1="    onPointerSlopReached: (change: PointerInputChange, overSlop: Float) -> Unit"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/DragGestureDetectorCopy.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Scrim has parameter &apos;fraction&apos; with type Function0&lt;Float>."
+        errorLine1="    fraction: () -> Float,"
+        errorLine2="              ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Drawer.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method updateHeight has parameter &apos;onHeightUpdate&apos; with type Function1&lt;? super Integer, Unit>."
+        errorLine1="    onHeightUpdate: (Int) -> Unit"
+        errorLine2="                    ~~~~~~~~~~~~~">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/material/ExposedDropdownMenu.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method NavigationRailTransition has parameter &apos;content&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    content: @Composable (animationProgress: Float) -> Unit"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/NavigationRail.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method OutlinedTextFieldLayout has parameter &apos;onLabelMeasured&apos; with type Function1&lt;? super Size, Unit>."
+        errorLine1="    onLabelMeasured: (Size) -> Unit,"
+        errorLine2="                     ~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor OutlinedTextFieldMeasurePolicy has parameter &apos;onLabelMeasured&apos; with type Function1&lt;? super Size, Unit>."
+        errorLine1="    private val onLabelMeasured: (Size) -> Unit,"
+        errorLine2="                                 ~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicWidth has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicHeight has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/OutlinedTextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method pullRefresh has parameter &apos;onPull&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    onPull: (pullDelta: Float) -> Float,"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method pullRefresh has parameter &apos;onRelease&apos; with type Function2&lt;? super Float, ? super Continuation&lt;? super Float>, ? extends Object>."
+        errorLine1="    onRelease: suspend (flingVelocity: Float) -> Float,"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor PullRefreshNestedScrollConnection has parameter &apos;onPull&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    private val onPull: (pullDelta: Float) -> Float,"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor PullRefreshNestedScrollConnection has parameter &apos;onRelease&apos; with type Function2&lt;? super Float, ? super Continuation&lt;? super Float>, ? extends Object>."
+        errorLine1="    private val onRelease: suspend (flingVelocity: Float) -> Float,"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/pullrefresh/PullRefresh.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Slider has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    onValueChange: (Float) -> Unit,"
+        errorLine2="                   ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToUserValue&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToUserValue(offset: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToOffset&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToOffset(userValue: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;scaleToOffset&apos; with type Function1&lt;? super Float, ? extends Float>."
+        errorLine1="        fun scaleToOffset(userValue: Float) ="
+        errorLine2="        ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;postPointerSlop&apos; with type Function2&lt;? super PointerInputChange, ? super Float, ? extends Unit>."
+        errorLine1="    val postPointerSlop = { pointerInput: PointerInputChange, offset: Float ->"
+        errorLine2="    ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method CorrectValueSideEffect has parameter &apos;scaleToOffset&apos; with type Function1&lt;? super Float, Float>."
+        errorLine1="    scaleToOffset: (Float) -> Float,"
+        errorLine2="                   ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method sliderSemantics has parameter &apos;onValueChange&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    onValueChange: (Float) -> Unit,"
+        errorLine2="                   ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type State&lt;Function2&lt;Boolean, Float, Unit>> of &apos;getOnDrag&apos;."
+        errorLine1="    val onDrag: State&lt;(Boolean, Float) -> Unit>,"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor SliderDraggableState has parameter &apos;onDelta&apos; with type Function1&lt;? super Float, Unit>."
+        errorLine1="    val onDelta: (Float) -> Unit"
+        errorLine2="                 ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function1&lt;Float, Unit> of &apos;getOnDelta&apos;."
+        errorLine1="    val onDelta: (Float) -> Unit"
+        errorLine2="                 ~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Slider.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method setThresholds$lint_module has parameter &apos;&lt;set-?>&apos; with type Function2&lt;? super Float, ? super Float, Float>."
+        errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in return type Function2&lt;Float, Float, Float> of &apos;getThresholds$lint_module&apos;."
+        errorLine1="    internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method computeTarget has parameter &apos;thresholds&apos; with type Function2&lt;? super Float, ? super Float, Float>."
+        errorLine1="    thresholds: (Float, Float) -> Float,"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Swipeable.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method SwitchImpl has parameter &apos;thumbValue&apos; with type Function0&lt;Float>."
+        errorLine1="    thumbValue: () -> Float,"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/Switch.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicWidth has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method intrinsicHeight has parameter &apos;intrinsicMeasurer&apos; with type Function2&lt;? super IntrinsicMeasurable, ? super Integer, Integer>."
+        errorLine1="        intrinsicMeasurer: (IntrinsicMeasurable, Int) -> Int"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextField.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in variable &apos;labelColor&apos; with type Function1&lt;? super InputPhase, ? extends Color>."
+        errorLine1="    val labelColor: @Composable (InputPhase) -> Color = {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Transition has parameter &apos;contentColor&apos; with type Function1&lt;? super InputPhase, Color>."
+        errorLine1="        contentColor: @Composable (InputPhase) -> Color,"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+    <issue
+        id="PrimitiveInLambda"
+        message="Use a functional interface instead of lambda syntax for lambdas with primitive values in method Transition has parameter &apos;content&apos; with type Function4&lt;? super Float, ? super Color, ? super Color, ? super Float, Unit>."
+        errorLine1="        content: @Composable ("
+        errorLine2="                 ^">
+        <location
+            file="src/commonMain/kotlin/androidx/compose/material/TextFieldImpl.kt"/>
+    </issue>
+
+</issues>
diff --git a/wear/tiles/tiles-renderer/lint-baseline.xml b/wear/tiles/tiles-renderer/lint-baseline.xml
new file mode 100644
index 0000000..5498c78f
--- /dev/null
+++ b/wear/tiles/tiles-renderer/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="UnspecifiedRegisterReceiverFlag"
+        message="`updateReceiver` \&#xA;is missing `RECEIVER_EXPORTED` or `RECEIVER_NOT_EXPORTED` flag for unprotected \&#xA;broadcasts registered for androidx.wear.tiles.action.REQUEST_TILE_UPDATE"
+        errorLine1="        context.registerReceiver(updateReceiver, i)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/tiles/manager/TileUiClient.kt"/>
+    </issue>
+
+</issues>
diff --git a/wear/tiles/tiles/lint-baseline.xml b/wear/tiles/tiles/lint-baseline.xml
index a00428a..8dbfc75 100644
--- a/wear/tiles/tiles/lint-baseline.xml
+++ b/wear/tiles/tiles/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface ResourcesCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.wear.tiles.ResourcesData;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/tiles/ResourcesCallback.aidl"/>
     </issue>
@@ -14,25 +14,21 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ResourcesData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/tiles/ResourcesData.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable ResourcesRequestData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/tiles/ResourcesRequestData.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable TileAddEventData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileAddEventData.aidl"/>
     </issue>
@@ -40,8 +36,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface TileCallback {"
-        errorLine2="^">
+        errorLine1="import androidx.wear.tiles.TileData;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileCallback.aidl"/>
     </issue>
@@ -50,7 +46,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable TileData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileData.aidl"/>
     </issue>
@@ -66,9 +62,7 @@
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable TileLeaveEventData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileLeaveEventData.aidl"/>
     </issue>
@@ -76,8 +70,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface TileProvider {"
-        errorLine2="^">
+        errorLine1="import android.widget.RemoteViews;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileProvider.aidl"/>
     </issue>
@@ -86,16 +80,14 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable TileRemoveEventData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileRemoveEventData.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable TileRequestData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileRequestData.aidl"/>
     </issue>
@@ -104,7 +96,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable TileUpdateRequestData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileUpdateRequestData.aidl"/>
     </issue>
@@ -112,8 +104,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface TileUpdateRequesterService {"
-        errorLine2="^">
+        errorLine1="import android.content.ComponentName;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/tiles/TileUpdateRequesterService.aidl"/>
     </issue>
diff --git a/wear/watchface/watchface-complications-data-source/lint-baseline.xml b/wear/watchface/watchface-complications-data-source/lint-baseline.xml
new file mode 100644
index 0000000..5edf002
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source/lint-baseline.xml
@@ -0,0 +1,67 @@
+<?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">
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
+        errorLine1="        [TargetWatchFaceSafety.UNKNOWN, TargetWatchFaceSafety.SAFE, TargetWatchFaceSafety.UNSAFE]"
+        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
+        errorLine1="        [TargetWatchFaceSafety.UNKNOWN, TargetWatchFaceSafety.SAFE, TargetWatchFaceSafety.UNSAFE]"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
+        errorLine1="        [TargetWatchFaceSafety.UNKNOWN, TargetWatchFaceSafety.SAFE, TargetWatchFaceSafety.UNSAFE]"
+        errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
+        errorLine1="                        TargetWatchFaceSafety.UNKNOWN"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
+        errorLine1="                        ?: TargetWatchFaceSafety.UNKNOWN"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
+        errorLine1="                        TargetWatchFaceSafety.UNKNOWN"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 33 (current min is 26): `TargetWatchFaceSafety`"
+        errorLine1="                        ?: TargetWatchFaceSafety.UNKNOWN"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceService.kt"/>
+    </issue>
+
+</issues>
diff --git a/wear/watchface/watchface-complications-data/lint-baseline.xml b/wear/watchface/watchface-complications-data/lint-baseline.xml
index d24916d..5bd4b2e0 100644
--- a/wear/watchface/watchface-complications-data/lint-baseline.xml
+++ b/wear/watchface/watchface-complications-data/lint-baseline.xml
@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 33 (current min is 26): `GoalProgressComplicationData`"
+        errorLine1="            is GoalProgressComplicationData -> placeholder.contentDescription"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/data/Data.kt"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 33 (current min is 26): `WeightedElementsComplicationData`"
+        errorLine1="            is WeightedElementsComplicationData -> placeholder.contentDescription"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/complications/data/Data.kt"/>
+    </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable ComplicationData;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/android/support/wearable/complications/ComplicationData.aidl"/>
     </issue>
@@ -14,7 +30,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ComplicationProviderInfo;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/android/support/wearable/complications/ComplicationProviderInfo.aidl"/>
     </issue>
@@ -31,7 +47,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IComplicationProvider {"
+        errorLine1="    // IMPORTANT NOTE: All methods must be given an explicit transaction id that must never change"
         errorLine2="^">
         <location
             file="src/main/aidl/android/support/wearable/complications/IComplicationProvider.aidl"/>
@@ -40,8 +56,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="oneway interface IPreviewComplicationDataCallback {"
-        errorLine2="^">
+        errorLine1=""
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/android/support/wearable/complications/IPreviewComplicationDataCallback.aidl"/>
     </issue>
@@ -49,7 +65,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IProviderInfoService {"
+        errorLine1=" *"
         errorLine2="^">
         <location
             file="src/main/aidl/android/support/wearable/complications/IProviderInfoService.aidl"/>
diff --git a/wear/watchface/watchface-data/lint-baseline.xml b/wear/watchface/watchface-data/lint-baseline.xml
index c6c3733..7f589a2 100644
--- a/wear/watchface/watchface-data/lint-baseline.xml
+++ b/wear/watchface/watchface-data/lint-baseline.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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">
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable ComplicationRenderParams;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/ComplicationRenderParams.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable ComplicationSlotMetadataWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/ComplicationSlotMetadataWireFormat.aidl"/>
     </issue>
@@ -23,16 +19,14 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ComplicationStateWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/ComplicationStateWireFormat.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable ContentDescriptionLabel;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/android/support/wearable/watchface/accessibility/ContentDescriptionLabel.aidl"/>
     </issue>
@@ -41,16 +35,14 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable CrashInfoParcel;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/CrashInfoParcel.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable DefaultProviderPoliciesParams;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/DefaultProviderPoliciesParams.aidl"/>
     </issue>
@@ -59,7 +51,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable EditorStateWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/editor/data/EditorStateWireFormat.aidl"/>
     </issue>
@@ -68,7 +60,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable GetComplicationSlotMetadataParams;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/GetComplicationSlotMetadataParams.aidl"/>
     </issue>
@@ -77,7 +69,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable GetUserStyleFlavorsParams;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/GetUserStyleFlavorsParams.aidl"/>
     </issue>
@@ -86,7 +78,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable GetUserStyleSchemaParams;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/GetUserStyleSchemaParams.aidl"/>
     </issue>
@@ -103,8 +95,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IEditorObserver {"
-        errorLine2="^">
+        errorLine1=""
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/editor/IEditorObserver.aidl"/>
     </issue>
@@ -112,8 +104,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IEditorService {"
-        errorLine2="^">
+        errorLine1=""
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/editor/IEditorService.aidl"/>
     </issue>
@@ -121,8 +113,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IHeadlessWatchFace {"
-        errorLine2="^">
+        errorLine1="import androidx.wear.watchface.control.data.WatchFaceRenderParams;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/IHeadlessWatchFace.aidl"/>
     </issue>
@@ -130,8 +122,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IInteractiveWatchFace {"
-        errorLine2="^">
+        errorLine1="import androidx.wear.watchface.control.IRemoteWatchFaceView;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/IInteractiveWatchFace.aidl"/>
     </issue>
@@ -139,8 +131,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IPendingInteractiveWatchFace {"
-        errorLine2="^">
+        errorLine1="import androidx.wear.watchface.control.data.CrashInfoParcel;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/IPendingInteractiveWatchFace.aidl"/>
     </issue>
@@ -148,8 +140,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IRemoteWatchFaceView {"
-        errorLine2="^">
+        errorLine1="import androidx.wear.watchface.control.data.WatchFaceRenderParams;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/IRemoteWatchFaceView.aidl"/>
     </issue>
@@ -157,7 +149,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IWatchFaceControlService {"
+        errorLine1="import androidx.wear.watchface.control.data.HeadlessWatchFaceInstanceParams;"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/IWatchFaceControlService.aidl"/>
@@ -166,8 +158,8 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IWatchFaceService {"
-        errorLine2="^">
+        errorLine1="import android.os.Bundle;"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/android/support/wearable/watchface/IWatchFaceService.aidl"/>
     </issue>
@@ -175,7 +167,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IWatchfaceListener {"
+        errorLine1="    // IMPORTANT NOTE: All methods must be given an explicit transaction id that must never change"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/IWatchfaceListener.aidl"/>
@@ -184,7 +176,7 @@
     <issue
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="interface IWatchfaceReadyListener {"
+        errorLine1="    /**"
         errorLine2="^">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/IWatchfaceReadyListener.aidl"/>
@@ -194,7 +186,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable IdAndComplicationDataWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/IdAndComplicationDataWireFormat.aidl"/>
     </issue>
@@ -203,7 +195,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable IdAndComplicationStateWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/IdAndComplicationStateWireFormat.aidl"/>
     </issue>
@@ -212,7 +204,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable IdTypeAndDefaultProviderPolicyWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/IdTypeAndDefaultProviderPolicyWireFormat.aidl"/>
     </issue>
@@ -221,7 +213,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ImmutableSystemState;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/ImmutableSystemState.aidl"/>
     </issue>
@@ -230,7 +222,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable ParcelableWrapper;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/android/support/wearable/watchface/ParcelableWrapper.aidl"/>
     </issue>
@@ -239,34 +231,28 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable RenderParametersWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/RenderParametersWireFormat.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable UserStyleFlavorsWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/watchface/style/data/UserStyleFlavorsWireFormat.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable UserStyleSchemaWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/watchface/style/data/UserStyleSchemaWireFormat.aidl"/>
     </issue>
 
     <issue
         id="RequireUnstableAidlAnnotation"
-        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
-        errorLine1="parcelable UserStyleWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker">
         <location
             file="src/main/aidl/androidx/wear/watchface/style/data/UserStyleWireFormat.aidl"/>
     </issue>
@@ -275,7 +261,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable WallpaperInteractiveWatchFaceInstanceParams;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/WallpaperInteractiveWatchFaceInstanceParams.aidl"/>
     </issue>
@@ -284,7 +270,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable WatchFaceColorsWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/WatchFaceColorsWireFormat.aidl"/>
     </issue>
@@ -293,7 +279,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable WatchFaceOverlayStyleWireFormat;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/WatchFaceOverlayStyleWireFormat.aidl"/>
     </issue>
@@ -302,7 +288,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable WatchFaceRenderParams;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/WatchFaceRenderParams.aidl"/>
     </issue>
@@ -311,7 +297,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable WatchFaceStyle;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/android/support/wearable/watchface/WatchFaceStyle.aidl"/>
     </issue>
@@ -320,7 +306,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable WatchFaceSurfaceRenderParams;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/control/data/WatchFaceSurfaceRenderParams.aidl"/>
     </issue>
@@ -329,7 +315,7 @@
         id="RequireUnstableAidlAnnotation"
         message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
         errorLine1="parcelable WatchUiState;"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/aidl/androidx/wear/watchface/data/WatchUiState.aidl"/>
     </issue>
diff --git a/wear/watchface/watchface-samples-minimal-complications/lint-baseline.xml b/wear/watchface/watchface-samples-minimal-complications/lint-baseline.xml
new file mode 100644
index 0000000..ae9a59a
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-complications/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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">
+
+    <issue
+        id="WearStandaloneAppFlag"
+        message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
+        errorLine1="    &lt;application"
+        errorLine2="     ~~~~~~~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+</issues>
diff --git a/wear/watchface/watchface-samples-minimal-instances/lint-baseline.xml b/wear/watchface/watchface-samples-minimal-instances/lint-baseline.xml
new file mode 100644
index 0000000..667a1f6a
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="WearStandaloneAppFlag"
+        message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
+        errorLine1="    &lt;application"
+        errorLine2="     ~~~~~~~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+</issues>
diff --git a/wear/watchface/watchface-samples-minimal-style/lint-baseline.xml b/wear/watchface/watchface-samples-minimal-style/lint-baseline.xml
new file mode 100644
index 0000000..667a1f6a
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-style/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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="WearStandaloneAppFlag"
+        message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
+        errorLine1="    &lt;application"
+        errorLine2="     ~~~~~~~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+</issues>
diff --git a/wear/watchface/watchface-style/lint-baseline.xml b/wear/watchface/watchface-style/lint-baseline.xml
new file mode 100644
index 0000000..4e453d5
--- /dev/null
+++ b/wear/watchface/watchface-style/lint-baseline.xml
@@ -0,0 +1,13 @@
+<?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">
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 33 (current min is 26): `LargeCustomValueUserStyleSetting`"
+        errorLine1="                is UserStyleSetting.LargeCustomValueUserStyleSetting ->"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/wear/watchface/style/CurrentUserStyleRepository.kt"/>
+    </issue>
+
+</issues>
diff --git a/wear/watchface/watchface-style/old-api-test-stub/lint-baseline.xml b/wear/watchface/watchface-style/old-api-test-stub/lint-baseline.xml
index 2fed09c..dc10f61 100644
--- a/wear/watchface/watchface-style/old-api-test-stub/lint-baseline.xml
+++ b/wear/watchface/watchface-style/old-api-test-stub/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="RequireUnstableAidlAnnotation"
diff --git a/wear/watchface/watchface/lint-baseline.xml b/wear/watchface/watchface/lint-baseline.xml
index 48b884a..61f18b9 100644
--- a/wear/watchface/watchface/lint-baseline.xml
+++ b/wear/watchface/watchface/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="VisibleForTests"
@@ -22,8 +22,8 @@
     <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
-        errorLine1="                complicationSlotsManager.watchState = watchState"
-        errorLine2="                                         ~~~~~~~~~~">
+        errorLine1="                    complicationSlotsManager.watchState = watchState"
+        errorLine2="                                             ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"/>
     </issue>
diff --git a/work/integration-tests/testapp/lint-baseline.xml b/work/integration-tests/testapp/lint-baseline.xml
index aa1295b..c033d44 100644
--- a/work/integration-tests/testapp/lint-baseline.xml
+++ b/work/integration-tests/testapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
         id="BanThreadSleep"
@@ -47,51 +47,6 @@
     </issue>
 
     <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 21; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    jobScheduler.cancelAll();"
-        errorLine2="                                 ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 21; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        jobScheduler.schedule("
-        errorLine2="                                     ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 21; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                                new JobInfo.Builder("
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 21; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                                        .setMinimumLatency(10 * 60 * 1000)"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 21; however, the containing class null is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                                        .build());"
-        errorLine2="                                         ~~~~~">
-        <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.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="    protected void onCreate(final Bundle savedInstanceState) {"
@@ -211,15 +166,6 @@
     <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="    protected void onCreate(Bundle savedInstanceState) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.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 static String TAG = &quot;RecursiveWorker&quot;;"
         errorLine2="                  ~~~~~~">
         <location
diff --git a/work/work-runtime/lint-baseline.xml b/work/work-runtime/lint-baseline.xml
index 592cc869..8527d1f 100644
--- a/work/work-runtime/lint-baseline.xml
+++ b/work/work-runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta05" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta05)" variant="all" version="8.1.0-beta05">
+<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="BanSynchronizedMethods"
@@ -155,6 +155,33 @@
     </issue>
 
     <issue
+        id="ForegroundServiceType"
+        message="To call `Service.startForeground()`, the `&lt;service>` element of manifest file must have the `foregroundServiceType` attribute specified"
+        errorLine1="                    startForeground(notificationId, notification);"
+        errorLine2="                    ~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/work/impl/foreground/SystemForegroundService.java"/>
+    </issue>
+
+    <issue
+        id="ForegroundServiceType"
+        message="To call `Service.startForeground()`, the `&lt;service>` element of manifest file must have the `foregroundServiceType` attribute specified"
+        errorLine1="            service.startForeground(id, notification, foregroundServiceType);"
+        errorLine2="                    ~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/work/impl/foreground/SystemForegroundService.java"/>
+    </issue>
+
+    <issue
+        id="ForegroundServiceType"
+        message="To call `Service.startForeground()`, the `&lt;service>` element of manifest file must have the `foregroundServiceType` attribute specified"
+        errorLine1="                service.startForeground(id, notification, foregroundServiceType);"
+        errorLine2="                        ~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/work/impl/foreground/SystemForegroundService.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 final void addListener(Runnable listener, Executor executor) {"