diff --git a/animation/lint-baseline.xml b/animation/lint-baseline.xml
index 9e332f6..3a06af3 100644
--- a/animation/lint-baseline.xml
+++ b/animation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
diff --git a/animation/testing/lint-baseline.xml b/animation/testing/lint-baseline.xml
index 184390c..7401f83 100644
--- a/animation/testing/lint-baseline.xml
+++ b/animation/testing/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/annotation/annotation-experimental-lint/integration-tests/lint-baseline.xml b/annotation/annotation-experimental-lint/integration-tests/lint-baseline.xml
index 2fe55b4..d91df8b4 100644
--- a/annotation/annotation-experimental-lint/integration-tests/lint-baseline.xml
+++ b/annotation/annotation-experimental-lint/integration-tests/lint-baseline.xml
@@ -1,37 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
-
-    <issue
-        id="UnsafeExperimentalUsageError"
-        message="This declaration is experimental and its usage should be marked with&#xA;&apos;@sample.ExperimentalDateTime&apos; or &apos;@UseExperimental(sample.ExperimentalDateTime.class)&apos;"
-        errorLine1="        DateProvider provider = new DateProvider();"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/sample/UseExperimentalClassUnchecked.java"
-            line="29"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnsafeExperimentalUsageError"
-        message="This declaration is experimental and its usage should be marked with&#xA;&apos;@sample.ExperimentalDateTime&apos; or &apos;@UseExperimental(sample.ExperimentalDateTime.class)&apos;"
-        errorLine1="        return provider.getDate();"
-        errorLine2="                        ~~~~~~~">
-        <location
-            file="src/main/java/sample/UseExperimentalClassUnchecked.java"
-            line="30"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnsafeExperimentalUsageError"
-        message="This declaration is experimental and its usage should be marked with&#xA;&apos;@sample.ExperimentalDateTime&apos; or &apos;@UseExperimental(sample.ExperimentalDateTime.class)&apos;"
-        errorLine1="        System.out.println(getDate());"
-        errorLine2="                           ~~~~~~~">
-        <location
-            file="src/main/java/sample/UseExperimentalMethodUnchecked.java"
-            line="35"
-            column="28"/>
-    </issue>
+<issues format="5" by="lint 3.5.0-beta05" client="gradle" variant="debug" version="3.5.0-beta05">
 
 </issues>
diff --git a/appcompat/lint-baseline.xml b/appcompat/lint-baseline.xml
index 20e2811..25c1ecb 100644
--- a/appcompat/lint-baseline.xml
+++ b/appcompat/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
diff --git a/appcompat/resources/lint-baseline.xml b/appcompat/resources/lint-baseline.xml
index 4033514..ecd14aa 100644
--- a/appcompat/resources/lint-baseline.xml
+++ b/appcompat/resources/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
diff --git a/arch/core-common/lint-baseline.xml b/arch/core-common/lint-baseline.xml
index 00791145..25ce7a3 100644
--- a/arch/core-common/lint-baseline.xml
+++ b/arch/core-common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/arch/core-runtime/lint-baseline.xml b/arch/core-runtime/lint-baseline.xml
index 938c8f8..74db960 100644
--- a/arch/core-runtime/lint-baseline.xml
+++ b/arch/core-runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/arch/core-testing/lint-baseline.xml b/arch/core-testing/lint-baseline.xml
index 378f59f..a5e9d2c 100644
--- a/arch/core-testing/lint-baseline.xml
+++ b/arch/core-testing/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/biometric/lint-baseline.xml b/biometric/lint-baseline.xml
index 38fe9ea..8514f5e 100644
--- a/biometric/lint-baseline.xml
+++ b/biometric/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/buildSrc/src/main/kotlin/androidx/build/LintConfiguration.kt b/buildSrc/src/main/kotlin/androidx/build/LintConfiguration.kt
index 1cdd342..6413218 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LintConfiguration.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LintConfiguration.kt
@@ -26,6 +26,17 @@
  */
 private const val CHECK_UNKNOWN_NULLNESS = "checkUnknownNullness"
 
+/**
+ * Setting this property means that lint will update lint-baseline.xml if it exists.
+ */
+private const val UPDATE_LINT_BASELINE = "updateLintBaseline"
+
+/**
+ * Property used by Lint to continue creating baselines without failing lint, normally set by:
+ * -Dlint.baselines.continue=true from command line.
+ */
+private const val LINT_BASELINE_CONTINUE = "lint.baselines.continue"
+
 fun Project.configureNonAndroidProjectForLint(extension: AndroidXExtension) {
     apply(mapOf("plugin" to "com.android.lint"))
 
@@ -43,6 +54,12 @@
 }
 
 fun Project.configureLint(lintOptions: LintOptions, extension: AndroidXExtension) {
+    // If -PcheckUnknownNullness was set we should fail on UnknownNullness warnings
+    val checkUnknownNullness = hasProperty(CHECK_UNKNOWN_NULLNESS)
+
+    // If -PupdateLintBaseline was set we should update the baseline if it exists
+    val updateLintBaseline = hasProperty(UPDATE_LINT_BASELINE)
+
     // Lint is configured entirely in afterEvaluate so that individual projects cannot easily
     // disable individual checks in the DSL for any reason. That being said, when rolling out a new
     // check as fatal, it can be beneficial to set it to fatal above this comment. This allows you
@@ -68,9 +85,6 @@
 
             fatal("VisibleForTests")
 
-            // If -PcheckUnknownNullness was set we should fail on UnknownNullness warnings
-            val checkUnknownNullness = hasProperty(CHECK_UNKNOWN_NULLNESS)
-
             if (extension.compilationTarget != CompilationTarget.HOST) {
                 // Ignore other errors since we are only interested in nullness here
                 if (checkUnknownNullness) {
@@ -102,9 +116,6 @@
                 }
             }
 
-            // Baseline file for all legacy lint warnings.
-            val baselineFile = lintBaseline
-
             val lintDebugTask = tasks.named("lintDebug")
 
             if (checkUnknownNullness) {
@@ -115,17 +126,26 @@
                         )
                     }
                 }
-            } else if (baselineFile.exists()) {
-                // Number of currently ignored UnknownNullness errors
-                val count = baselineFile.readText().split("UnknownNullness").size - 1
-                if (count > 0) {
-                    lintDebugTask.configure {
-                        it.doLast {
-                            logger.warn(getIgnoreNullnessError(count))
+            } else if (lintBaseline.exists()) {
+                if (updateLintBaseline) {
+                    // Continue generating baselines regardless of errors
+                    isAbortOnError = false
+                    // Avoid printing every single lint error to the terminal
+                    textReport = false
+                    lintBaseline.delete()
+                    System.setProperty(LINT_BASELINE_CONTINUE, "true")
+                } else {
+                    // Number of currently ignored UnknownNullness errors
+                    val count = lintBaseline.readText().split("UnknownNullness").size - 1
+                    if (count > 0) {
+                        lintDebugTask.configure {
+                            it.doLast {
+                                logger.warn(getIgnoreNullnessError(count))
+                            }
                         }
                     }
                 }
-                baseline(baselineFile)
+                baseline(lintBaseline)
             }
         }
     }
diff --git a/camera/camera-camera2/lint-baseline.xml b/camera/camera-camera2/lint-baseline.xml
index 1607c50..cef0276 100644
--- a/camera/camera-camera2/lint-baseline.xml
+++ b/camera/camera-camera2/lint-baseline.xml
@@ -1,93 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 3, &quot;executor&quot;, in androidx.camera.camera2.impl.compat.CameraCaptureSessionCompat.captureBurstRequests) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull CameraCaptureSession.CaptureCallback callback)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/compat/CameraCaptureSessionCompat.java"
-            line="102"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 3, &quot;executor&quot;, in androidx.camera.camera2.impl.compat.CameraCaptureSessionCompat.captureSingleRequest) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull CameraCaptureSession.CaptureCallback callback)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/compat/CameraCaptureSessionCompat.java"
-            line="148"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 3, &quot;executor&quot;, in androidx.camera.camera2.impl.compat.CameraCaptureSessionCompat.setRepeatingBurstRequests) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull CameraCaptureSession.CaptureCallback callback)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/compat/CameraCaptureSessionCompat.java"
-            line="193"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 3, &quot;executor&quot;, in androidx.camera.camera2.impl.compat.CameraCaptureSessionCompat.setSingleRepeatingRequest) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull CameraCaptureSession.CaptureCallback callback)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/compat/CameraCaptureSessionCompat.java"
-            line="235"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 2, &quot;executor&quot;, in androidx.camera.camera2.impl.compat.CameraManagerCompat.openCamera) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull CameraDevice.StateCallback callback)"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/compat/CameraManagerCompat.java"
-            line="78"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 3, &quot;executor&quot;, in androidx.camera.camera2.impl.compat.params.SessionConfigurationCompat.SessionConfigurationCompat) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull CameraCaptureSession.StateCallback cb) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/compat/params/SessionConfigurationCompat.java"
-            line="86"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static AppConfig create(Context context) {"
-        errorLine2="                  ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/Camera2AppConfig.java"
-            line="53"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static AppConfig create(Context context) {"
-        errorLine2="                                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/Camera2AppConfig.java"
-            line="53"
-            column="36"/>
-    </issue>
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -114,358 +26,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCropRegion(final Rect crop) {"
-        errorLine2="                                    ~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CameraControl.java"
-            line="108"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            final Rect focus,"
-        errorLine2="                  ~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CameraControl.java"
-            line="126"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            final Rect metering,"
-        errorLine2="                  ~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CameraControl.java"
-            line="127"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void focus(Rect focus, Rect metering) {"
-        errorLine2="                      ~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CameraControl.java"
-            line="209"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void focus(Rect focus, Rect metering) {"
-        errorLine2="                                  ~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CameraControl.java"
-            line="209"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FlashMode getFlashMode() {"
-        errorLine2="           ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CameraControl.java"
-            line="255"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setFlashMode(FlashMode flashMode) {"
-        errorLine2="                             ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CameraControl.java"
-            line="261"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void submitCaptureRequests(final List&lt;CaptureConfig> captureConfigs) {"
-        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CameraControl.java"
-            line="433"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraCaptureSession.CaptureCallback createNoOpCallback() {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CaptureCallbacks.java"
-            line="46"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraCaptureSession.CaptureCallback createComboCallback("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CaptureCallbacks.java"
-            line="57"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCaptureSession.CaptureCallback... callbacks) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2CaptureCallbacks.java"
-            line="58"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Camera2DeviceSurfaceManager(Context context) {"
-        errorLine2="                                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="58"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            String cameraId, List&lt;SurfaceConfig> surfaceConfigList) {"
-        errorLine2="            ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="82"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            String cameraId, List&lt;SurfaceConfig> surfaceConfigList) {"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="82"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SurfaceConfig transformSurfaceConfig(String cameraId, int imageFormat, Size size) {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="112"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SurfaceConfig transformSurfaceConfig(String cameraId, int imageFormat, Size size) {"
-        errorLine2="                                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="112"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SurfaceConfig transformSurfaceConfig(String cameraId, int imageFormat, Size size) {"
-        errorLine2="                                                                                  ~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="112"
-            column="83"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Map&lt;UseCase, Size> getSuggestedResolutions("
-        errorLine2="           ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="139"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            String cameraId, List&lt;UseCase> originalUseCases, List&lt;UseCase> newUseCases) {"
-        errorLine2="            ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="140"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            String cameraId, List&lt;UseCase> originalUseCases, List&lt;UseCase> newUseCases) {"
-        errorLine2="                             ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="140"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            String cameraId, List&lt;UseCase> originalUseCases, List&lt;UseCase> newUseCases) {"
-        errorLine2="                                                             ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="140"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Size getMaxOutputSize(String cameraId, int imageFormat) {"
-        errorLine2="           ~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="216"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Size getMaxOutputSize(String cameraId, int imageFormat) {"
-        errorLine2="                                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="216"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Size getPreviewSize() {"
-        errorLine2="           ~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2DeviceSurfaceManager.java"
-            line="238"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Uri uri,"
-        errorLine2="            ~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2Initializer.java"
-            line="51"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getType(Uri uri) {"
-        errorLine2="                          ~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2Initializer.java"
-            line="61"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Uri insert(Uri uri, @Nullable ContentValues contentValues) {"
-        errorLine2="                      ~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2Initializer.java"
-            line="67"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public int delete(Uri uri, @Nullable String s, @Nullable String[] strings) {"
-        errorLine2="                      ~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2Initializer.java"
-            line="72"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Uri uri,"
-        errorLine2="            ~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/Camera2Initializer.java"
-            line="78"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCaptureSession session, CaptureRequest request, Surface surface, long frame) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/CameraBurstCaptureCallback.java"
-            line="56"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCaptureSession session, CaptureRequest request, Surface surface, long frame) {"
-        errorLine2="                                          ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/CameraBurstCaptureCallback.java"
-            line="56"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCaptureSession session, CaptureRequest request, Surface surface, long frame) {"
-        errorLine2="                                                                  ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/CameraBurstCaptureCallback.java"
-            line="56"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public CaptureConfig onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
@@ -521,44 +81,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ComboCameraEventCallback createComboCallback() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/CameraEventCallbacks.java"
-            line="43"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraEventCallbacks createEmptyCallback() {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/CameraEventCallbacks.java"
-            line="48"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public MultiValueSet&lt;CameraEventCallback> clone() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/camera2/impl/CameraEventCallbacks.java"
-            line="53"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public List&lt;CaptureConfig> onPresetSession() {"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/CameraEventCallbacks.java"
-            line="78"
+            line="81"
             column="16"/>
     </issue>
 
@@ -569,7 +96,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/CameraEventCallbacks.java"
-            line="95"
+            line="101"
             column="16"/>
     </issue>
 
@@ -580,7 +107,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/CameraEventCallbacks.java"
-            line="112"
+            line="119"
             column="16"/>
     </issue>
 
@@ -591,7 +118,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/CameraEventCallbacks.java"
-            line="129"
+            line="137"
             column="16"/>
     </issue>
 
@@ -602,7 +129,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/CameraManagerCompat.java"
-            line="45"
+            line="46"
             column="19"/>
     </issue>
 
@@ -613,7 +140,7 @@
         errorLine2="                                           ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/CameraManagerCompat.java"
-            line="45"
+            line="46"
             column="44"/>
     </issue>
 
@@ -624,7 +151,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/ImageAnalysisConfigProvider.java"
-            line="52"
+            line="49"
             column="40"/>
     </issue>
 
@@ -635,7 +162,7 @@
         errorLine2="                                                                    ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/ImageAnalysisConfigProvider.java"
-            line="52"
+            line="49"
             column="69"/>
     </issue>
 
@@ -646,7 +173,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/ImageAnalysisConfigProvider.java"
-            line="58"
+            line="55"
             column="12"/>
     </issue>
 
@@ -657,7 +184,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/ImageAnalysisConfigProvider.java"
-            line="58"
+            line="55"
             column="42"/>
     </issue>
 
@@ -668,7 +195,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/ImageCaptureConfigProvider.java"
-            line="52"
+            line="49"
             column="39"/>
     </issue>
 
@@ -679,7 +206,7 @@
         errorLine2="                                                                   ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/ImageCaptureConfigProvider.java"
-            line="52"
+            line="49"
             column="68"/>
     </issue>
 
@@ -690,7 +217,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/ImageCaptureConfigProvider.java"
-            line="58"
+            line="55"
             column="12"/>
     </issue>
 
@@ -701,7 +228,7 @@
         errorLine2="                                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/ImageCaptureConfigProvider.java"
-            line="58"
+            line="55"
             column="41"/>
     </issue>
 
@@ -712,7 +239,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/PreviewConfigProvider.java"
-            line="48"
+            line="49"
             column="34"/>
     </issue>
 
@@ -723,7 +250,7 @@
         errorLine2="                                                              ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/PreviewConfigProvider.java"
-            line="48"
+            line="49"
             column="63"/>
     </issue>
 
@@ -734,7 +261,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/PreviewConfigProvider.java"
-            line="54"
+            line="55"
             column="12"/>
     </issue>
 
@@ -745,7 +272,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/PreviewConfigProvider.java"
-            line="54"
+            line="55"
             column="36"/>
     </issue>
 
@@ -756,7 +283,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/params/SessionConfigurationCompat.java"
-            line="138"
+            line="137"
             column="19"/>
     </issue>
 
@@ -767,7 +294,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/params/SessionConfigurationCompat.java"
-            line="163"
+            line="162"
             column="12"/>
     </issue>
 
@@ -778,7 +305,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/params/SessionConfigurationCompat.java"
-            line="172"
+            line="171"
             column="12"/>
     </issue>
 
@@ -789,7 +316,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/params/SessionConfigurationCompat.java"
-            line="181"
+            line="180"
             column="12"/>
     </issue>
 
@@ -800,7 +327,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/params/SessionConfigurationCompat.java"
-            line="190"
+            line="189"
             column="12"/>
     </issue>
 
@@ -811,7 +338,7 @@
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/params/SessionConfigurationCompat.java"
-            line="212"
+            line="211"
             column="12"/>
     </issue>
 
@@ -822,7 +349,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/compat/params/SessionConfigurationCompat.java"
-            line="234"
+            line="233"
             column="38"/>
     </issue>
 
@@ -833,7 +360,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/VideoCaptureConfigProvider.java"
-            line="52"
+            line="49"
             column="39"/>
     </issue>
 
@@ -844,7 +371,7 @@
         errorLine2="                                                                   ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/VideoCaptureConfigProvider.java"
-            line="52"
+            line="49"
             column="68"/>
     </issue>
 
@@ -855,7 +382,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/VideoCaptureConfigProvider.java"
-            line="58"
+            line="55"
             column="12"/>
     </issue>
 
@@ -866,7 +393,7 @@
         errorLine2="                                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/impl/VideoCaptureConfigProvider.java"
-            line="58"
+            line="55"
             column="41"/>
     </issue>
 
diff --git a/camera/camera-core/lint-baseline.xml b/camera/camera-core/lint-baseline.xml
index a396eee..b66eae8 100644
--- a/camera/camera-core/lint-baseline.xml
+++ b/camera/camera-core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -48,45 +48,45 @@
     <issue
         id="LambdaLast"
         message="Functional interface parameters (such as parameter 1, &quot;lifecycleOwner&quot;, in androidx.camera.core.CameraX.bindToLifecycle) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="    public static void bindToLifecycle(LifecycleOwner lifecycleOwner, UseCase... useCases) {"
-        errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            @NonNull UseCase... useCases) {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="171"
-            column="71"/>
+            line="210"
+            column="13"/>
     </issue>
 
     <issue
         id="LambdaLast"
         message="Functional interface parameters (such as parameter 1, &quot;lifecycleOwner&quot;, in androidx.camera.core.CameraX.bindToLifecycle) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="    public static void bindToLifecycle(LifecycleOwner lifecycleOwner, UseCase... useCases) {"
-        errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            @NonNull UseCase... useCases) {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="171"
-            column="71"/>
+            line="210"
+            column="13"/>
     </issue>
 
     <issue
         id="LambdaLast"
         message="Functional interface parameters (such as parameter 1, &quot;errorListener&quot;, in androidx.camera.core.CameraX.setErrorListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="    public static void setErrorListener(ErrorListener errorListener, Handler handler) {"
-        errorLine2="                                                                     ~~~~~~~~~~~~~~~">
+        errorLine1="            @Nullable Handler handler) {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="486"
-            column="70"/>
+            line="550"
+            column="13"/>
     </issue>
 
     <issue
         id="LambdaLast"
         message="Functional interface parameters (such as parameter 1, &quot;errorListener&quot;, in androidx.camera.core.CameraX.setErrorListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="    public static void setErrorListener(ErrorListener errorListener, Handler handler) {"
-        errorLine2="                                                                     ~~~~~~~~~~~~~~~">
+        errorLine1="            @Nullable Handler handler) {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="486"
-            column="70"/>
+            line="550"
+            column="13"/>
     </issue>
 
     <issue
@@ -202,50 +202,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void onCaptureCompleted(CameraCaptureResult result) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraCaptureCallbacks.java"
-            line="84"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void onCaptureCompleted(CameraCaptureResult result) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraCaptureCallbacks.java"
-            line="84"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void onCaptureFailed(CameraCaptureFailure failure) {"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraCaptureCallbacks.java"
-            line="91"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void onCaptureFailed(CameraCaptureFailure failure) {"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraCaptureCallbacks.java"
-            line="91"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public CameraCaptureFailure(Reason reason) {"
         errorLine2="                                ~~~~~~">
         <location
@@ -668,7 +624,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="46"
+            line="58"
             column="28"/>
     </issue>
 
@@ -679,7 +635,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="46"
+            line="58"
             column="28"/>
     </issue>
 
@@ -690,7 +646,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="46"
+            line="58"
             column="45"/>
     </issue>
 
@@ -701,7 +657,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="46"
+            line="58"
             column="45"/>
     </issue>
 
@@ -712,7 +668,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="56"
+            line="68"
             column="5"/>
     </issue>
 
@@ -723,7 +679,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="56"
+            line="68"
             column="5"/>
     </issue>
 
@@ -734,7 +690,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="56"
+            line="68"
             column="42"/>
     </issue>
 
@@ -745,7 +701,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="56"
+            line="68"
             column="42"/>
     </issue>
 
@@ -756,7 +712,7 @@
         errorLine2="                                                                           ~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="56"
+            line="68"
             column="76"/>
     </issue>
 
@@ -767,7 +723,7 @@
         errorLine2="                                                                           ~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="56"
+            line="68"
             column="76"/>
     </issue>
 
@@ -778,7 +734,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="66"
+            line="78"
             column="27"/>
     </issue>
 
@@ -789,7 +745,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="66"
+            line="78"
             column="27"/>
     </issue>
 
@@ -800,7 +756,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="76"
+            line="88"
             column="5"/>
     </issue>
 
@@ -811,7 +767,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="76"
+            line="88"
             column="5"/>
     </issue>
 
@@ -822,7 +778,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="77"
+            line="89"
             column="13"/>
     </issue>
 
@@ -833,7 +789,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="77"
+            line="89"
             column="13"/>
     </issue>
 
@@ -844,7 +800,7 @@
         errorLine2="                             ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="77"
+            line="89"
             column="30"/>
     </issue>
 
@@ -855,7 +811,7 @@
         errorLine2="                             ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="77"
+            line="89"
             column="30"/>
     </issue>
 
@@ -866,7 +822,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="77"
+            line="89"
             column="62"/>
     </issue>
 
@@ -877,7 +833,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="77"
+            line="89"
             column="62"/>
     </issue>
 
@@ -888,7 +844,7 @@
         errorLine2="    ~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="84"
+            line="96"
             column="5"/>
     </issue>
 
@@ -899,7 +855,7 @@
         errorLine2="    ~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraDeviceSurfaceManager.java"
-            line="84"
+            line="96"
             column="5"/>
     </issue>
 
@@ -1064,7 +1020,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraRepository.java"
-            line="151"
+            line="152"
             column="12"/>
     </issue>
 
@@ -1075,7 +1031,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraRepository.java"
-            line="151"
+            line="152"
             column="12"/>
     </issue>
 
@@ -1086,7 +1042,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraRepository.java"
-            line="151"
+            line="152"
             column="33"/>
     </issue>
 
@@ -1097,7 +1053,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraRepository.java"
-            line="151"
+            line="152"
             column="33"/>
     </issue>
 
@@ -1108,7 +1064,7 @@
         errorLine2="                              ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraRepository.java"
-            line="180"
+            line="181"
             column="31"/>
     </issue>
 
@@ -1119,7 +1075,7 @@
         errorLine2="                              ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraRepository.java"
-            line="180"
+            line="181"
             column="31"/>
     </issue>
 
@@ -1130,7 +1086,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraRepository.java"
-            line="202"
+            line="203"
             column="33"/>
     </issue>
 
@@ -1141,128 +1097,18 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraRepository.java"
-            line="202"
+            line="203"
             column="33"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void bindToLifecycle(LifecycleOwner lifecycleOwner, UseCase... useCases) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="171"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void bindToLifecycle(LifecycleOwner lifecycleOwner, UseCase... useCases) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="171"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void bindToLifecycle(LifecycleOwner lifecycleOwner, UseCase... useCases) {"
-        errorLine2="                                                                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="171"
-            column="71"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void bindToLifecycle(LifecycleOwner lifecycleOwner, UseCase... useCases) {"
-        errorLine2="                                                                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="171"
-            column="71"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static boolean isBound(UseCase useCase) {"
-        errorLine2="                                  ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="214"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static boolean isBound(UseCase useCase) {"
-        errorLine2="                                  ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="214"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void unbind(UseCase... useCases) {"
-        errorLine2="                              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="242"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void unbind(UseCase... useCases) {"
-        errorLine2="                              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="242"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static boolean hasCameraWithLensFacing(LensFacing lensFacing)"
-        errorLine2="                                                  ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="305"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static boolean hasCameraWithLensFacing(LensFacing lensFacing)"
-        errorLine2="                                                  ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="305"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public static String getCameraWithLensFacing(LensFacing lensFacing)"
         errorLine2="                                                 ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="324"
+            line="373"
             column="50"/>
     </issue>
 
@@ -1273,7 +1119,7 @@
         errorLine2="                                                 ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="324"
+            line="373"
             column="50"/>
     </issue>
 
@@ -1284,7 +1130,7 @@
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="344"
+            line="394"
             column="58"/>
     </issue>
 
@@ -1295,7 +1141,7 @@
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="344"
+            line="394"
             column="58"/>
     </issue>
 
@@ -1306,7 +1152,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="405"
+            line="458"
             column="52"/>
     </issue>
 
@@ -1317,84 +1163,18 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="405"
+            line="458"
             column="52"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraControl getCameraControl(LensFacing lensFacing)"
-        errorLine2="                  ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="438"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraControl getCameraControl(LensFacing lensFacing)"
-        errorLine2="                  ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="438"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraControl getCameraControl(LensFacing lensFacing)"
-        errorLine2="                                                 ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="438"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraControl getCameraControl(LensFacing lensFacing)"
-        errorLine2="                                                 ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="438"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraDeviceSurfaceManager getSurfaceManager() {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="453"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraDeviceSurfaceManager getSurfaceManager() {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="453"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="            Class&lt;C> configType, LensFacing lensFacing) {"
         errorLine2="            ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="472"
+            line="533"
             column="13"/>
     </issue>
 
@@ -1405,7 +1185,7 @@
         errorLine2="            ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="472"
+            line="533"
             column="13"/>
     </issue>
 
@@ -1416,7 +1196,7 @@
         errorLine2="                                 ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="472"
+            line="533"
             column="34"/>
     </issue>
 
@@ -1427,123 +1207,13 @@
         errorLine2="                                 ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/CameraX.java"
-            line="472"
+            line="533"
             column="34"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setErrorListener(ErrorListener errorListener, Handler handler) {"
-        errorLine2="                                        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="486"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setErrorListener(ErrorListener errorListener, Handler handler) {"
-        errorLine2="                                        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="486"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setErrorListener(ErrorListener errorListener, Handler handler) {"
-        errorLine2="                                                                     ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="486"
-            column="70"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setErrorListener(ErrorListener errorListener, Handler handler) {"
-        errorLine2="                                                                     ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="486"
-            column="70"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void postError(ErrorCode errorCode, String message) {"
-        errorLine2="                                 ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="498"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void postError(ErrorCode errorCode, String message) {"
-        errorLine2="                                 ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="498"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void postError(ErrorCode errorCode, String message) {"
-        errorLine2="                                                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="498"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void postError(ErrorCode errorCode, String message) {"
-        errorLine2="                                                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="498"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void init(Context context, @NonNull AppConfig appConfig) {"
-        errorLine2="                            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="513"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void init(Context context, @NonNull AppConfig appConfig) {"
-        errorLine2="                            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/CameraX.java"
-            line="513"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    List&lt;CaptureStage> getCaptureStages();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
@@ -2120,7 +1790,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="45"
+            line="48"
             column="28"/>
     </issue>
 
@@ -2131,7 +1801,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="45"
+            line="48"
             column="28"/>
     </issue>
 
@@ -2142,7 +1812,7 @@
         errorLine2="             ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="59"
+            line="62"
             column="14"/>
     </issue>
 
@@ -2153,7 +1823,7 @@
         errorLine2="             ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="59"
+            line="62"
             column="14"/>
     </issue>
 
@@ -2164,7 +1834,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="59"
+            line="62"
             column="36"/>
     </issue>
 
@@ -2175,7 +1845,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="59"
+            line="62"
             column="36"/>
     </issue>
 
@@ -2186,7 +1856,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="75"
+            line="78"
             column="36"/>
     </issue>
 
@@ -2197,7 +1867,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="75"
+            line="78"
             column="36"/>
     </issue>
 
@@ -2208,7 +1878,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="94"
+            line="97"
             column="22"/>
     </issue>
 
@@ -2219,7 +1889,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="94"
+            line="97"
             column="22"/>
     </issue>
 
@@ -2230,7 +1900,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="94"
+            line="97"
             column="45"/>
     </issue>
 
@@ -2241,7 +1911,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="94"
+            line="97"
             column="45"/>
     </issue>
 
@@ -2252,7 +1922,7 @@
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="103"
+            line="106"
             column="5"/>
     </issue>
 
@@ -2263,40 +1933,18 @@
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="103"
+            line="106"
             column="5"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        MutableConfig getMutableConfig();"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/Config.java"
-            line="117"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        MutableConfig getMutableConfig();"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/Config.java"
-            line="117"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        boolean onOptionMatched(Option&lt;?> option);"
         errorLine2="                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="136"
+            line="141"
             column="33"/>
     </issue>
 
@@ -2307,7 +1955,7 @@
         errorLine2="                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="136"
+            line="141"
             column="33"/>
     </issue>
 
@@ -2318,7 +1966,7 @@
         errorLine2="                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="169"
+            line="174"
             column="27"/>
     </issue>
 
@@ -2329,7 +1977,7 @@
         errorLine2="                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="169"
+            line="174"
             column="27"/>
     </issue>
 
@@ -2340,7 +1988,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="169"
+            line="174"
             column="44"/>
     </issue>
 
@@ -2351,7 +1999,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="169"
+            line="174"
             column="44"/>
     </issue>
 
@@ -2362,7 +2010,7 @@
         errorLine2="                                                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="169"
+            line="174"
             column="55"/>
     </issue>
 
@@ -2373,7 +2021,7 @@
         errorLine2="                                                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="169"
+            line="174"
             column="55"/>
     </issue>
 
@@ -2384,7 +2032,7 @@
         errorLine2="                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="189"
+            line="194"
             column="27"/>
     </issue>
 
@@ -2395,7 +2043,7 @@
         errorLine2="                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="189"
+            line="194"
             column="27"/>
     </issue>
 
@@ -2406,7 +2054,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="189"
+            line="194"
             column="44"/>
     </issue>
 
@@ -2417,7 +2065,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="189"
+            line="194"
             column="44"/>
     </issue>
 
@@ -2428,7 +2076,7 @@
         errorLine2="                                                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="189"
+            line="194"
             column="55"/>
     </issue>
 
@@ -2439,7 +2087,7 @@
         errorLine2="                                                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="189"
+            line="194"
             column="55"/>
     </issue>
 
@@ -2450,7 +2098,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="202"
+            line="207"
             column="25"/>
     </issue>
 
@@ -2461,7 +2109,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="202"
+            line="207"
             column="25"/>
     </issue>
 
@@ -2472,7 +2120,7 @@
         errorLine2="                        ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="209"
+            line="214"
             column="25"/>
     </issue>
 
@@ -2483,7 +2131,7 @@
         errorLine2="                        ~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Config.java"
-            line="209"
+            line="214"
             column="25"/>
     </issue>
 
@@ -2934,7 +2582,7 @@
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="315"
+            line="317"
             column="64"/>
     </issue>
 
@@ -2945,84 +2593,18 @@
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="315"
+            line="317"
             column="64"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="332"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="332"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="333"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="333"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        void analyze(ImageProxy image, int rotationDegrees);"
-        errorLine2="                     ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="412"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        void analyze(ImageProxy image, int rotationDegrees);"
-        errorLine2="                     ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="412"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public ImageAnalysisConfig getConfig(LensFacing lensFacing) {"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="447"
+            line="450"
             column="16"/>
     </issue>
 
@@ -3033,7 +2615,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="447"
+            line="450"
             column="16"/>
     </issue>
 
@@ -3044,7 +2626,7 @@
         errorLine2="                                             ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="447"
+            line="450"
             column="46"/>
     </issue>
 
@@ -3055,7 +2637,7 @@
         errorLine2="                                             ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageAnalysis.java"
-            line="447"
+            line="450"
             column="46"/>
     </issue>
 
@@ -3066,7 +2648,7 @@
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="326"
+            line="323"
             column="64"/>
     </issue>
 
@@ -3077,172 +2659,18 @@
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="326"
+            line="323"
             column="64"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected void onCameraControlReady(String cameraId) {"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="343"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected void onCameraControlReady(String cameraId) {"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="343"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FlashMode getFlashMode() {"
-        errorLine2="           ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="352"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FlashMode getFlashMode() {"
-        errorLine2="           ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="352"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setFlashMode(FlashMode flashMode) {"
-        errorLine2="                             ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="361"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setFlashMode(FlashMode flashMode) {"
-        errorLine2="                             ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="361"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setTargetAspectRatioCustom(Rational aspectRatio) {"
-        errorLine2="                                           ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="381"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setTargetAspectRatioCustom(Rational aspectRatio) {"
-        errorLine2="                                           ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="381"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="714"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="714"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="715"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="715"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void onCaptureSuccess(ImageProxy image, int rotationDegrees) {"
-        errorLine2="                                     ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="1153"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void onCaptureSuccess(ImageProxy image, int rotationDegrees) {"
-        errorLine2="                                     ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="1153"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public ImageCaptureConfig getConfig(LensFacing lensFacing) {"
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="1192"
+            line="1156"
             column="16"/>
     </issue>
 
@@ -3253,7 +2681,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="1192"
+            line="1156"
             column="16"/>
     </issue>
 
@@ -3264,7 +2692,7 @@
         errorLine2="                                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="1192"
+            line="1156"
             column="45"/>
     </issue>
 
@@ -3275,7 +2703,7 @@
         errorLine2="                                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageCapture.java"
-            line="1192"
+            line="1156"
             column="45"/>
     </issue>
 
@@ -3326,94 +2754,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    Rect getCropRect();"
-        errorLine2="    ~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageProxy.java"
-            line="43"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    Rect getCropRect();"
-        errorLine2="    ~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageProxy.java"
-            line="43"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void setCropRect(Rect rect);"
-        errorLine2="                     ~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageProxy.java"
-            line="50"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void setCropRect(Rect rect);"
-        errorLine2="                     ~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageProxy.java"
-            line="50"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    PlaneProxy[] getPlanes();"
-        errorLine2="    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageProxy.java"
-            line="92"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    PlaneProxy[] getPlanes();"
-        errorLine2="    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageProxy.java"
-            line="92"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        ByteBuffer getBuffer();"
-        errorLine2="        ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageProxy.java"
-            line="115"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        ByteBuffer getBuffer();"
-        errorLine2="        ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageProxy.java"
-            line="115"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    Surface getSurface();"
         errorLine2="    ~~~~~~~">
         <location
@@ -3462,7 +2802,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageReaderProxys.java"
-            line="80"
+            line="83"
             column="19"/>
     </issue>
 
@@ -3473,79 +2813,13 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/ImageReaderProxys.java"
-            line="80"
+            line="83"
             column="19"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static ImageReaderProxy createSharedReader("
-        errorLine2="                  ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageReaderProxys.java"
-            line="97"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static ImageReaderProxy createSharedReader("
-        errorLine2="                  ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageReaderProxys.java"
-            line="97"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            String cameraId, int width, int height, int format, int maxImages,"
-        errorLine2="            ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageReaderProxys.java"
-            line="98"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            String cameraId, int width, int height, int format, int maxImages,"
-        errorLine2="            ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageReaderProxys.java"
-            line="98"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Executor executor) {"
-        errorLine2="            ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageReaderProxys.java"
-            line="99"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Executor executor) {"
-        errorLine2="            ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/ImageReaderProxys.java"
-            line="99"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        void onImageSaved(File file);"
         errorLine2="                          ~~~~">
         <location
@@ -3682,7 +2956,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/MultiValueSet.java"
-            line="62"
+            line="63"
             column="21"/>
     </issue>
 
@@ -3693,7 +2967,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/MultiValueSet.java"
-            line="62"
+            line="63"
             column="21"/>
     </issue>
 
@@ -4140,33 +3414,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void zoom(Rect crop) {"
-        errorLine2="                     ~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/Preview.java"
-            line="479"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void zoom(Rect crop) {"
-        errorLine2="                     ~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/Preview.java"
-            line="479"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    protected UseCaseConfig.Builder&lt;?, ?, ?> getDefaultBuilder(LensFacing lensFacing) {"
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Preview.java"
-            line="546"
+            line="513"
             column="64"/>
     </issue>
 
@@ -4177,7 +3429,7 @@
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Preview.java"
-            line="546"
+            line="513"
             column="64"/>
     </issue>
 
@@ -4188,7 +3440,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Preview.java"
-            line="562"
+            line="529"
             column="40"/>
     </issue>
 
@@ -4199,62 +3451,18 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Preview.java"
-            line="562"
+            line="529"
             column="40"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/Preview.java"
-            line="603"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/Preview.java"
-            line="603"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/Preview.java"
-            line="604"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/Preview.java"
-            line="604"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public PreviewConfig getConfig(LensFacing lensFacing) {"
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Preview.java"
-            line="750"
+            line="730"
             column="16"/>
     </issue>
 
@@ -4265,7 +3473,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Preview.java"
-            line="750"
+            line="730"
             column="16"/>
     </issue>
 
@@ -4276,7 +3484,7 @@
         errorLine2="                                       ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Preview.java"
-            line="750"
+            line="730"
             column="40"/>
     </issue>
 
@@ -4287,7 +3495,7 @@
         errorLine2="                                       ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/Preview.java"
-            line="750"
+            line="730"
             column="40"/>
     </issue>
 
@@ -5020,22 +4228,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getName() {"
-        errorLine2="           ~~~~~~">
+        errorLine1="    public UseCaseConfig&lt;?> getUseCaseConfig() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="371"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getName() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/UseCase.java"
-            line="371"
+            line="383"
             column="12"/>
     </issue>
 
@@ -5046,18 +4243,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="382"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public UseCaseConfig&lt;?> getUseCaseConfig() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/UseCase.java"
-            line="382"
+            line="383"
             column="12"/>
     </issue>
 
@@ -5068,7 +4254,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="394"
+            line="395"
             column="12"/>
     </issue>
 
@@ -5079,7 +4265,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="394"
+            line="395"
             column="12"/>
     </issue>
 
@@ -5090,7 +4276,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="394"
+            line="395"
             column="46"/>
     </issue>
 
@@ -5101,7 +4287,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="394"
+            line="395"
             column="46"/>
     </issue>
 
@@ -5112,7 +4298,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="407"
+            line="408"
             column="43"/>
     </issue>
 
@@ -5123,62 +4309,18 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="407"
+            line="408"
             column="43"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected abstract Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="                       ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/UseCase.java"
-            line="428"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected abstract Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="                       ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/UseCase.java"
-            line="428"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap);"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/UseCase.java"
-            line="429"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap);"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/UseCase.java"
-            line="429"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    protected void onCameraControlReady(String cameraId) {"
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="439"
+            line="441"
             column="41"/>
     </issue>
 
@@ -5189,7 +4331,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="439"
+            line="441"
             column="41"/>
     </issue>
 
@@ -5200,7 +4342,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="462"
+            line="481"
             column="15"/>
     </issue>
 
@@ -5211,7 +4353,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="462"
+            line="481"
             column="15"/>
     </issue>
 
@@ -5222,7 +4364,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="462"
+            line="481"
             column="54"/>
     </issue>
 
@@ -5233,7 +4375,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="462"
+            line="481"
             column="54"/>
     </issue>
 
@@ -5618,7 +4760,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="146"
+            line="147"
             column="25"/>
     </issue>
 
@@ -5629,7 +4771,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="146"
+            line="147"
             column="25"/>
     </issue>
 
@@ -5640,7 +4782,7 @@
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="181"
+            line="182"
             column="64"/>
     </issue>
 
@@ -5651,62 +4793,18 @@
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="181"
+            line="182"
             column="64"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="198"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="198"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="199"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="199"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public VideoCaptureConfig getConfig(LensFacing lensFacing) {"
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="939"
+            line="941"
             column="16"/>
     </issue>
 
@@ -5717,7 +4815,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="939"
+            line="941"
             column="16"/>
     </issue>
 
@@ -5728,7 +4826,7 @@
         errorLine2="                                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="939"
+            line="941"
             column="45"/>
     </issue>
 
@@ -5739,7 +4837,7 @@
         errorLine2="                                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="939"
+            line="941"
             column="45"/>
     </issue>
 
diff --git a/camera/camera-extensions-stub/lint-baseline.xml b/camera/camera-extensions-stub/lint-baseline.xml
index 0014ad5..3dc4cb1 100644
--- a/camera/camera-extensions-stub/lint-baseline.xml
+++ b/camera/camera-extensions-stub/lint-baseline.xml
@@ -1,48 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="32"
-            column="41"/>
+            line="45"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="38"
-            column="50"/>
+            line="45"
+            column="39"/>
     </issue>
 
     <issue
@@ -52,7 +30,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="43"
+            line="50"
             column="12"/>
     </issue>
 
@@ -63,7 +41,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="48"
+            line="55"
             column="12"/>
     </issue>
 
@@ -74,7 +52,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="58"
+            line="65"
             column="24"/>
     </issue>
 
@@ -85,7 +63,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="58"
+            line="65"
             column="41"/>
     </issue>
 
@@ -96,7 +74,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="59"
+            line="66"
             column="13"/>
     </issue>
 
@@ -107,7 +85,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="69"
+            line="76"
             column="12"/>
     </issue>
 
@@ -118,7 +96,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="74"
+            line="81"
             column="12"/>
     </issue>
 
@@ -129,52 +107,41 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="79"
+            line="86"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="32"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
+            line="91"
+            column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="33"
-            column="13"/>
+            line="47"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="38"
-            column="50"/>
+            line="47"
+            column="39"/>
     </issue>
 
     <issue
@@ -184,7 +151,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="43"
+            line="52"
             column="12"/>
     </issue>
 
@@ -195,601 +162,557 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="48"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorImpl getProcessor() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="53"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="58"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="58"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="59"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onPresetSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="69"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onEnableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="74"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onDisableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="79"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="32"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="38"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="43"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="48"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="58"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="58"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="59"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onPresetSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="69"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onEnableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="74"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onDisableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="79"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="32"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="38"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl getCaptureStage() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="43"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorType getProcessorType() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="48"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorImpl getProcessor() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="53"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="58"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="58"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="59"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onPresetSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="69"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onEnableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="74"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onDisableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="79"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="32"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="38"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="43"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="48"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="58"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="58"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="59"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onPresetSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="69"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onEnableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="74"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onDisableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="79"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="30"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="31"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="36"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="36"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl getCaptureStage() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="41"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorType getProcessorType() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="46"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorImpl getProcessor() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="51"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="56"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="56"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
             line="57"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorImpl getProcessor() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="62"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="67"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="67"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            Context context) {"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="68"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onPresetSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="78"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onEnableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="83"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onDisableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="88"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="93"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="45"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="45"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="50"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="55"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="65"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="65"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            Context context) {"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="66"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onPresetSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="76"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onEnableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="81"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onDisableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="86"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="91"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="47"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="47"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl getCaptureStage() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="52"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorType getProcessorType() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="57"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorImpl getProcessor() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="62"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="67"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="67"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            Context context) {"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="68"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onPresetSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="78"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onEnableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="83"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onDisableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="88"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="93"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="45"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="45"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="50"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="55"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="65"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="65"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            Context context) {"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="66"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onPresetSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="76"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onEnableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="81"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onDisableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="86"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="91"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="45"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="45"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl getCaptureStage() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="50"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorType getProcessorType() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="55"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorImpl getProcessor() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="60"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="65"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="65"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            Context context) {"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="66"
             column="13"/>
     </issue>
 
@@ -800,7 +723,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="67"
+            line="76"
             column="12"/>
     </issue>
 
@@ -811,7 +734,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="72"
+            line="81"
             column="12"/>
     </issue>
 
@@ -822,7 +745,18 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="77"
+            line="86"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="91"
             column="12"/>
     </issue>
 
@@ -833,7 +767,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"
-            line="40"
+            line="42"
             column="18"/>
     </issue>
 
@@ -844,7 +778,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java"
-            line="35"
+            line="37"
             column="5"/>
     </issue>
 
@@ -855,7 +789,7 @@
         errorLine2="                ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="39"
+            line="41"
             column="17"/>
     </issue>
 
@@ -866,7 +800,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="39"
+            line="41"
             column="34"/>
     </issue>
 
@@ -877,7 +811,7 @@
         errorLine2="                                                                              ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="39"
+            line="41"
             column="79"/>
     </issue>
 
@@ -888,7 +822,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="57"
+            line="59"
             column="5"/>
     </issue>
 
@@ -899,7 +833,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="68"
+            line="70"
             column="5"/>
     </issue>
 
@@ -910,7 +844,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="78"
+            line="80"
             column="5"/>
     </issue>
 
@@ -921,7 +855,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"
-            line="51"
+            line="53"
             column="12"/>
     </issue>
 
@@ -932,52 +866,30 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"
-            line="51"
+            line="53"
             column="35"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="32"
-            column="41"/>
+            line="45"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="38"
-            column="50"/>
+            line="45"
+            column="39"/>
     </issue>
 
     <issue
@@ -987,7 +899,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="43"
+            line="50"
             column="12"/>
     </issue>
 
@@ -998,7 +910,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="48"
+            line="55"
             column="12"/>
     </issue>
 
@@ -1009,7 +921,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="58"
+            line="65"
             column="24"/>
     </issue>
 
@@ -1020,7 +932,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="58"
+            line="65"
             column="41"/>
     </issue>
 
@@ -1031,7 +943,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="59"
+            line="66"
             column="13"/>
     </issue>
 
@@ -1042,7 +954,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="69"
+            line="76"
             column="12"/>
     </issue>
 
@@ -1053,7 +965,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="74"
+            line="81"
             column="12"/>
     </issue>
 
@@ -1064,52 +976,41 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="79"
+            line="86"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="32"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
+            line="91"
+            column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="33"
-            column="13"/>
+            line="47"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="38"
-            column="50"/>
+            line="47"
+            column="39"/>
     </issue>
 
     <issue
@@ -1119,7 +1020,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="43"
+            line="52"
             column="12"/>
     </issue>
 
@@ -1130,7 +1031,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="48"
+            line="57"
             column="12"/>
     </issue>
 
@@ -1141,7 +1042,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="53"
+            line="62"
             column="12"/>
     </issue>
 
@@ -1152,7 +1053,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="58"
+            line="67"
             column="24"/>
     </issue>
 
@@ -1163,7 +1064,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="58"
+            line="67"
             column="41"/>
     </issue>
 
@@ -1174,7 +1075,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="59"
+            line="68"
             column="13"/>
     </issue>
 
@@ -1185,7 +1086,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="69"
+            line="78"
             column="12"/>
     </issue>
 
@@ -1196,7 +1097,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="74"
+            line="83"
             column="12"/>
     </issue>
 
@@ -1207,7 +1108,18 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="79"
+            line="88"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
+            line="93"
             column="12"/>
     </issue>
 
@@ -1218,7 +1130,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="34"
+            line="41"
             column="34"/>
     </issue>
 
@@ -1229,30 +1141,30 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="34"
+            line="41"
             column="51"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics);"
-        errorLine2="                         ~~~~~~">
+        errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
+        errorLine2="              ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="42"
-            column="26"/>
+            line="52"
+            column="15"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics);"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="42"
-            column="43"/>
+            line="52"
+            column="32"/>
     </issue>
 
     <issue
@@ -1262,7 +1174,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="47"
+            line="57"
             column="5"/>
     </issue>
 
@@ -1273,52 +1185,30 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="50"
+            line="60"
             column="5"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="32"
-            column="41"/>
+            line="45"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="38"
-            column="50"/>
+            line="45"
+            column="39"/>
     </issue>
 
     <issue
@@ -1328,7 +1218,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="43"
+            line="50"
             column="12"/>
     </issue>
 
@@ -1339,7 +1229,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="48"
+            line="55"
             column="12"/>
     </issue>
 
@@ -1350,7 +1240,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="58"
+            line="65"
             column="24"/>
     </issue>
 
@@ -1361,7 +1251,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="58"
+            line="65"
             column="41"/>
     </issue>
 
@@ -1372,7 +1262,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="59"
+            line="66"
             column="13"/>
     </issue>
 
@@ -1383,7 +1273,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="69"
+            line="76"
             column="12"/>
     </issue>
 
@@ -1394,7 +1284,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="74"
+            line="81"
             column="12"/>
     </issue>
 
@@ -1405,52 +1295,41 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="79"
+            line="86"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="32"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
+            line="91"
+            column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="33"
-            column="13"/>
+            line="47"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="38"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="38"
-            column="50"/>
+            line="47"
+            column="39"/>
     </issue>
 
     <issue
@@ -1460,7 +1339,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="43"
+            line="52"
             column="12"/>
     </issue>
 
@@ -1471,7 +1350,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="48"
+            line="57"
             column="12"/>
     </issue>
 
@@ -1482,7 +1361,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="53"
+            line="62"
             column="12"/>
     </issue>
 
@@ -1493,7 +1372,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="58"
+            line="67"
             column="24"/>
     </issue>
 
@@ -1504,7 +1383,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="58"
+            line="67"
             column="41"/>
     </issue>
 
@@ -1515,7 +1394,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="59"
+            line="68"
             column="13"/>
     </issue>
 
@@ -1526,7 +1405,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="69"
+            line="78"
             column="12"/>
     </issue>
 
@@ -1537,7 +1416,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="74"
+            line="83"
             column="12"/>
     </issue>
 
@@ -1548,7 +1427,18 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="79"
+            line="88"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
+            line="93"
             column="12"/>
     </issue>
 
@@ -1559,7 +1449,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="43"
+            line="52"
             column="34"/>
     </issue>
 
@@ -1570,30 +1460,30 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="43"
+            line="52"
             column="51"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics);"
-        errorLine2="                         ~~~~~~">
+        errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
+        errorLine2="              ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="51"
-            column="26"/>
+            line="63"
+            column="15"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics);"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="51"
-            column="43"/>
+            line="63"
+            column="32"/>
     </issue>
 
     <issue
@@ -1603,7 +1493,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="64"
+            line="76"
             column="5"/>
     </issue>
 
@@ -1614,7 +1504,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="67"
+            line="79"
             column="5"/>
     </issue>
 
@@ -1625,7 +1515,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="75"
+            line="94"
             column="5"/>
     </issue>
 
@@ -1636,7 +1526,7 @@
         errorLine2="                 ~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"
-            line="37"
+            line="39"
             column="18"/>
     </issue>
 
@@ -1647,7 +1537,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"
-            line="37"
+            line="39"
             column="31"/>
     </issue>
 
@@ -1658,7 +1548,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"
-            line="30"
+            line="34"
             column="26"/>
     </issue>
 
@@ -1669,7 +1559,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"
-            line="40"
+            line="44"
             column="29"/>
     </issue>
 
@@ -1680,7 +1570,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"
-            line="33"
+            line="35"
             column="5"/>
     </issue>
 
@@ -1691,7 +1581,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"
-            line="33"
+            line="35"
             column="30"/>
     </issue>
 
diff --git a/camera/camera-extensions/lint-baseline.xml b/camera/camera-extensions/lint-baseline.xml
index ab851bf..71894ff 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="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/camera/camera-testing/lint-baseline.xml b/camera/camera-testing/lint-baseline.xml
index f992ee5..fe25486d 100644
--- a/camera/camera-testing/lint-baseline.xml
+++ b/camera/camera-testing/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
@@ -8,40 +8,18 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="86"
+            line="136"
             column="13"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static CameraDevice getCameraDevice()"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="60"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void releaseCameraDevice(CameraDevice cameraDevice) {"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="119"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public static CameraManager getCameraManager() {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="123"
+            line="220"
             column="19"/>
     </issue>
 
@@ -52,7 +30,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="140"
+            line="237"
             column="46"/>
     </issue>
 
@@ -63,7 +41,7 @@
         errorLine2="                                                              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="140"
+            line="237"
             column="63"/>
     </issue>
 
@@ -74,7 +52,7 @@
         errorLine2="            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="141"
+            line="238"
             column="13"/>
     </issue>
 
@@ -85,7 +63,7 @@
         errorLine2="                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="157"
+            line="254"
             column="48"/>
     </issue>
 
@@ -96,128 +74,18 @@
         errorLine2="                                                                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="157"
+            line="254"
             column="67"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected void onCreate(Bundle savedInstance) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeActivity.java"
-            line="29"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static AppConfig create() {"
-        errorLine2="                  ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeAppConfig.java"
-            line="40"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FakeCamera(String cameraId) {"
-        errorLine2="                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCamera.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FakeCamera(String cameraId,"
-        errorLine2="                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCamera.java"
-            line="70"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addOnlineUseCase(final Collection&lt;UseCase> useCases) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCamera.java"
-            line="147"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void removeOnlineUseCase(final Collection&lt;UseCase> useCases) {"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCamera.java"
-            line="167"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraControl getCameraControl() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCamera.java"
-            line="188"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraInfo getCameraInfo() {"
-        errorLine2="           ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCamera.java"
-            line="193"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onCameraControlUpdateSessionConfig(SessionConfig sessionConfig) {"
-        errorLine2="                                                   ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCamera.java"
-            line="198"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onCameraControlCaptureRequests(List&lt;CaptureConfig> captureConfigs) {"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCamera.java"
-            line="204"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void setAfMode(CameraCaptureMetaData.AfMode mode) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="40"
+            line="41"
             column="27"/>
     </issue>
 
@@ -228,7 +96,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="44"
+            line="45"
             column="28"/>
     </issue>
 
@@ -239,7 +107,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="48"
+            line="49"
             column="28"/>
     </issue>
 
@@ -250,7 +118,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="52"
+            line="53"
             column="29"/>
     </issue>
 
@@ -261,7 +129,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="56"
+            line="57"
             column="31"/>
     </issue>
 
@@ -272,7 +140,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="64"
+            line="65"
             column="24"/>
     </issue>
 
@@ -283,96 +151,19 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="105"
+            line="106"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCropRegion(final Rect crop) {"
-        errorLine2="                                    ~~~~">
+        errorLine1="    public void notifyAllRequestsOnCaptureCompleted(CameraCaptureResult result) {"
+        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="48"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            final Rect focus,"
-        errorLine2="                  ~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="54"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            final Rect metering,"
-        errorLine2="                  ~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="55"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void focus(Rect focus, Rect metering) {"
-        errorLine2="                      ~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void focus(Rect focus, Rect metering) {"
-        errorLine2="                                  ~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="62"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FlashMode getFlashMode() {"
-        errorLine2="           ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="67"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setFlashMode(FlashMode flashMode) {"
-        errorLine2="                             ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="72"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void submitCaptureRequests(List&lt;CaptureConfig> captureConfigs) {"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="111"
-            column="39"/>
+            line="78"
+            column="53"/>
     </issue>
 
     <issue
@@ -382,7 +173,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="41"
+            line="50"
             column="40"/>
     </issue>
 
@@ -393,7 +184,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="41"
+            line="50"
             column="57"/>
     </issue>
 
@@ -404,7 +195,7 @@
         errorLine2="                                                                                       ~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="41"
+            line="50"
             column="88"/>
     </issue>
 
@@ -415,7 +206,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="53"
+            line="72"
             column="35"/>
     </issue>
 
@@ -426,7 +217,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="53"
+            line="72"
             column="52"/>
     </issue>
 
@@ -437,7 +228,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="58"
+            line="77"
             column="12"/>
     </issue>
 
@@ -448,7 +239,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="58"
+            line="77"
             column="49"/>
     </issue>
 
@@ -459,7 +250,7 @@
         errorLine2="                                                                                  ~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="58"
+            line="77"
             column="83"/>
     </issue>
 
@@ -470,7 +261,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="64"
+            line="83"
             column="34"/>
     </issue>
 
@@ -481,7 +272,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="69"
+            line="88"
             column="12"/>
     </issue>
 
@@ -492,7 +283,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="70"
+            line="89"
             column="13"/>
     </issue>
 
@@ -503,7 +294,7 @@
         errorLine2="                             ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="70"
+            line="89"
             column="30"/>
     </issue>
 
@@ -514,7 +305,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="70"
+            line="89"
             column="62"/>
     </issue>
 
@@ -525,24 +316,13 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="90"
+            line="109"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FakeCameraInfo(int sensorRotation, LensFacing lensFacing) {"
-        errorLine2="                                              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraInfo.java"
-            line="41"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public FakeCaptureStage(int id, CaptureConfig captureConfig) {"
         errorLine2="                                    ~~~~~~~~~~~~~">
         <location
@@ -569,7 +349,7 @@
         errorLine2="                                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeConfig.java"
-            line="51"
+            line="52"
             column="35"/>
     </issue>
 
@@ -580,7 +360,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeConfig.java"
-            line="59"
+            line="60"
             column="43"/>
     </issue>
 
@@ -591,7 +371,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeConfig.java"
-            line="67"
+            line="68"
             column="43"/>
     </issue>
 
@@ -602,7 +382,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeConfig.java"
-            line="74"
+            line="75"
             column="29"/>
     </issue>
 
@@ -613,7 +393,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeConfig.java"
-            line="74"
+            line="75"
             column="44"/>
     </issue>
 
@@ -624,106 +404,29 @@
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeConfig.java"
-            line="81"
+            line="82"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public MutableConfig getMutableConfig() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeConfig.java"
-            line="98"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public FakeConfig build() {"
-        errorLine2="               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeConfig.java"
-            line="107"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void setTag(Object tag) {"
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageInfo.java"
-            line="28"
+            line="29"
             column="24"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Object getTag() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageInfo.java"
-            line="36"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Rect getCropRect() {"
-        errorLine2="           ~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="44"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCropRect(Rect rect) {"
-        errorLine2="                            ~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="49"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public PlaneProxy[] getPlanes() {"
-        errorLine2="           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="79"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public ImageInfo getImageInfo() {"
         errorLine2="           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="84"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Image getImage() {"
-        errorLine2="           ~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="89"
+            line="106"
             column="12"/>
     </issue>
 
@@ -734,7 +437,7 @@
         errorLine2="                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="105"
+            line="128"
             column="27"/>
     </issue>
 
@@ -745,7 +448,7 @@
         errorLine2="                             ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="109"
+            line="132"
             column="30"/>
     </issue>
 
@@ -756,7 +459,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="43"
+            line="71"
             column="12"/>
     </issue>
 
@@ -767,35 +470,35 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="48"
+            line="89"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setImageProxy(ImageProxy imageProxy) {"
-        errorLine2="                              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="95"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void setSurface(Surface surface) {"
         errorLine2="                           ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="99"
+            line="147"
             column="28"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void triggerImageAvailable(Object tag, long timestamp) throws InterruptedException {"
+        errorLine2="                                      ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
+            line="158"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public Lifecycle getLifecycle() {"
         errorLine2="           ~~~~~~~~~">
         <location
@@ -811,7 +514,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeUseCase.java"
-            line="37"
+            line="38"
             column="24"/>
     </issue>
 
@@ -822,7 +525,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeUseCase.java"
-            line="49"
+            line="50"
             column="15"/>
     </issue>
 
@@ -833,35 +536,13 @@
         errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeUseCase.java"
-            line="49"
+            line="50"
             column="64"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Map&lt;String, Size> onSuggestedResolutionUpdated("
-        errorLine2="              ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeUseCase.java"
-            line="67"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Map&lt;String, Size> suggestedResolutionMap) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeUseCase.java"
-            line="68"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public static void waitForLooperToIdle(Handler handler) throws InterruptedException {"
         errorLine2="                                           ~~~~~~~">
         <location
@@ -899,7 +580,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/StreamConfigurationMapUtil.java"
-            line="37"
+            line="40"
             column="19"/>
     </issue>
 
@@ -910,7 +591,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/StreamConfigurationMapUtil.java"
-            line="71"
+            line="74"
             column="19"/>
     </issue>
 
@@ -921,7 +602,7 @@
         errorLine2="            ~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/StreamConfigurationMapUtil.java"
-            line="72"
+            line="75"
             column="13"/>
     </issue>
 
@@ -932,7 +613,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/StreamConfigurationMapUtil.java"
-            line="72"
+            line="75"
             column="37"/>
     </issue>
 
diff --git a/camera/camera-view/lint-baseline.xml b/camera/camera-view/lint-baseline.xml
index c196496..63ed963 100644
--- a/camera/camera-view/lint-baseline.xml
+++ b/camera/camera-view/lint-baseline.xml
@@ -1,235 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraView(Context context) {"
-        errorLine2="                      ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="127"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraView(Context context, AttributeSet attrs) {"
-        errorLine2="                      ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="131"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraView(Context context, AttributeSet attrs) {"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="131"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraView(Context context, AttributeSet attrs, int defStyle) {"
-        errorLine2="                      ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="135"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraView(Context context, AttributeSet attrs, int defStyle) {"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="135"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {"
-        errorLine2="                      ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="141"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CameraView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="141"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void bindToLifecycle(LifecycleOwner lifecycleOwner) {"
-        errorLine2="                                ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="183"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected LayoutParams generateDefaultLayoutParams() {"
-        errorLine2="              ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="251"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Parcelable onSaveInstanceState() {"
-        errorLine2="              ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="257"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected void onRestoreInstanceState(Parcelable savedState) {"
-        errorLine2="                                          ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="277"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ScaleType getScaleType() {"
-        errorLine2="           ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="550"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setScaleType(ScaleType scaleType) {"
-        errorLine2="                             ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="561"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureMode getCaptureMode() {"
-        errorLine2="           ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="573"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCaptureMode(CaptureMode captureMode) {"
-        errorLine2="                               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="584"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean hasCameraWithLensFacing(LensFacing lensFacing) {"
-        errorLine2="                                           ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="669"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void focus(Rect focus, Rect metering) {"
-        errorLine2="                      ~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="718"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void focus(Rect focus, Rect metering) {"
-        errorLine2="                                  ~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="718"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public FlashMode getFlash() {"
-        errorLine2="           ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="723"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setFlash(FlashMode flashMode) {"
-        errorLine2="                         ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="728"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean onTouchEvent(MotionEvent event) {"
-        errorLine2="                                ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/view/CameraView.java"
-            line="741"
-            column="33"/>
-    </issue>
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
 </issues>
diff --git a/camera/integration-tests/extensionstestlib/lint-baseline.xml b/camera/integration-tests/extensionstestlib/lint-baseline.xml
index c4d3dfb..42b7cd4 100644
--- a/camera/integration-tests/extensionstestlib/lint-baseline.xml
+++ b/camera/integration-tests/extensionstestlib/lint-baseline.xml
@@ -1,48 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="50"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="50"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="54"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
             line="55"
-            column="13"/>
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
+            line="55"
+            column="39"/>
     </issue>
 
     <issue
@@ -52,7 +30,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="61"
+            line="66"
             column="12"/>
     </issue>
 
@@ -63,7 +41,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="72"
+            line="77"
             column="12"/>
     </issue>
 
@@ -74,7 +52,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="129"
+            line="134"
             column="24"/>
     </issue>
 
@@ -85,7 +63,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="129"
+            line="134"
             column="41"/>
     </issue>
 
@@ -96,7 +74,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="130"
+            line="135"
             column="13"/>
     </issue>
 
@@ -107,7 +85,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="140"
+            line="145"
             column="12"/>
     </issue>
 
@@ -118,7 +96,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="151"
+            line="156"
             column="12"/>
     </issue>
 
@@ -129,52 +107,41 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="162"
+            line="167"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="36"
-            column="33"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
+            line="183"
+            column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="36"
-            column="50"/>
+            line="45"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="40"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="41"
-            column="13"/>
+            line="45"
+            column="39"/>
     </issue>
 
     <issue
@@ -184,7 +151,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="47"
+            line="56"
             column="12"/>
     </issue>
 
@@ -195,7 +162,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="58"
+            line="67"
             column="12"/>
     </issue>
 
@@ -206,7 +173,18 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="63"
+            line="72"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
+            line="77"
             column="12"/>
     </issue>
 
@@ -217,7 +195,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="68"
+            line="82"
             column="24"/>
     </issue>
 
@@ -228,7 +206,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="68"
+            line="82"
             column="41"/>
     </issue>
 
@@ -239,7 +217,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="69"
+            line="83"
             column="13"/>
     </issue>
 
@@ -250,7 +228,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="79"
+            line="93"
             column="12"/>
     </issue>
 
@@ -261,7 +239,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="90"
+            line="104"
             column="12"/>
     </issue>
 
@@ -272,52 +250,30 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="101"
+            line="115"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="50"
-            column="33"/>
+            line="58"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="50"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="54"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="55"
-            column="13"/>
+            line="58"
+            column="39"/>
     </issue>
 
     <issue
@@ -327,7 +283,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="61"
+            line="70"
             column="12"/>
     </issue>
 
@@ -338,7 +294,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="72"
+            line="81"
             column="12"/>
     </issue>
 
@@ -349,7 +305,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="129"
+            line="138"
             column="24"/>
     </issue>
 
@@ -360,7 +316,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="129"
+            line="138"
             column="41"/>
     </issue>
 
@@ -371,458 +327,436 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="130"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onPresetSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="140"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onEnableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="151"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onDisableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="162"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="36"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="36"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="40"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="41"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl getCaptureStage() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="47"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorType getProcessorType() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="58"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorImpl getProcessor() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="63"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="68"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="68"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="69"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onPresetSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="79"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onEnableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="90"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onDisableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="101"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="50"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="50"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="54"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="55"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="61"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="72"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="130"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="130"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="131"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onPresetSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="141"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onEnableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="152"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onDisableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="163"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="39"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="39"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="46"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="47"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl getCaptureStage() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="53"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorType getProcessorType() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="58"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ProcessorImpl getProcessor() {"
-        errorLine2="           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="101"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="106"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="106"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="107"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onPresetSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="117"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onEnableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="128"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public CaptureStageImpl onDisableSession() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
             line="139"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onPresetSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="149"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onEnableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="160"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onDisableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="171"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
+            line="187"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="49"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="49"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl getCaptureStage() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="61"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorType getProcessorType() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="72"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorImpl getProcessor() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="77"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="82"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="102"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="102"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            Context context) {"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="103"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onPresetSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="113"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onEnableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="124"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onDisableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
+            line="135"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="55"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="55"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="66"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="77"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="135"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="135"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            Context context) {"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="136"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onPresetSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="146"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onEnableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="157"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onDisableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="168"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
+            line="184"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="48"
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="48"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl getCaptureStage() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="62"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorType getProcessorType() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="67"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public ProcessorImpl getProcessor() {"
+        errorLine2="           ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="110"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="115"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="120"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="120"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            Context context) {"
+        errorLine2="            ~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="121"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onPresetSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="131"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onEnableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="142"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public CaptureStageImpl onDisableSession() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
+            line="153"
             column="12"/>
     </issue>
 
@@ -833,7 +767,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"
-            line="38"
+            line="40"
             column="26"/>
     </issue>
 
@@ -844,7 +778,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"
-            line="50"
+            line="52"
             column="18"/>
     </issue>
 
@@ -855,7 +789,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"
-            line="59"
+            line="61"
             column="29"/>
     </issue>
 
@@ -866,7 +800,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java"
-            line="35"
+            line="37"
             column="5"/>
     </issue>
 
@@ -877,7 +811,7 @@
         errorLine2="                ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="39"
+            line="41"
             column="17"/>
     </issue>
 
@@ -888,7 +822,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="39"
+            line="41"
             column="34"/>
     </issue>
 
@@ -899,7 +833,7 @@
         errorLine2="                                                                              ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="39"
+            line="41"
             column="79"/>
     </issue>
 
@@ -910,7 +844,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="57"
+            line="59"
             column="5"/>
     </issue>
 
@@ -921,7 +855,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="68"
+            line="70"
             column="5"/>
     </issue>
 
@@ -932,7 +866,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="78"
+            line="80"
             column="5"/>
     </issue>
 
@@ -943,7 +877,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"
-            line="52"
+            line="59"
             column="12"/>
     </issue>
 
@@ -954,52 +888,30 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"
-            line="52"
+            line="59"
             column="35"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="53"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="53"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="57"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
             line="58"
-            column="13"/>
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
+            line="58"
+            column="39"/>
     </issue>
 
     <issue
@@ -1009,7 +921,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="64"
+            line="69"
             column="12"/>
     </issue>
 
@@ -1020,7 +932,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="91"
+            line="96"
             column="12"/>
     </issue>
 
@@ -1031,7 +943,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="168"
+            line="173"
             column="24"/>
     </issue>
 
@@ -1042,7 +954,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="168"
+            line="173"
             column="41"/>
     </issue>
 
@@ -1053,7 +965,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="169"
+            line="174"
             column="13"/>
     </issue>
 
@@ -1064,7 +976,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="179"
+            line="184"
             column="12"/>
     </issue>
 
@@ -1075,7 +987,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="185"
+            line="190"
             column="12"/>
     </issue>
 
@@ -1086,52 +998,41 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="191"
+            line="196"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="40"
-            column="33"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
+            line="207"
+            column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="40"
-            column="50"/>
+            line="48"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="44"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="45"
-            column="13"/>
+            line="48"
+            column="39"/>
     </issue>
 
     <issue
@@ -1141,7 +1042,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="51"
+            line="59"
             column="12"/>
     </issue>
 
@@ -1152,7 +1053,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="60"
+            line="68"
             column="12"/>
     </issue>
 
@@ -1163,7 +1064,18 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="65"
+            line="73"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
+            line="78"
             column="12"/>
     </issue>
 
@@ -1174,7 +1086,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="93"
+            line="118"
             column="24"/>
     </issue>
 
@@ -1185,7 +1097,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="93"
+            line="118"
             column="41"/>
     </issue>
 
@@ -1196,7 +1108,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="94"
+            line="119"
             column="13"/>
     </issue>
 
@@ -1207,7 +1119,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="104"
+            line="130"
             column="12"/>
     </issue>
 
@@ -1218,7 +1130,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="109"
+            line="135"
             column="12"/>
     </issue>
 
@@ -1229,7 +1141,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="114"
+            line="140"
             column="12"/>
     </issue>
 
@@ -1240,7 +1152,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="34"
+            line="41"
             column="34"/>
     </issue>
 
@@ -1251,30 +1163,30 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="34"
+            line="41"
             column="51"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics);"
-        errorLine2="                         ~~~~~~">
+        errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
+        errorLine2="              ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="42"
-            column="26"/>
+            line="52"
+            column="15"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics);"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="42"
-            column="43"/>
+            line="52"
+            column="32"/>
     </issue>
 
     <issue
@@ -1284,7 +1196,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="47"
+            line="57"
             column="5"/>
     </issue>
 
@@ -1295,52 +1207,30 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="50"
+            line="60"
             column="5"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="50"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="50"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="54"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
             line="55"
-            column="13"/>
+            column="22"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
+            line="55"
+            column="39"/>
     </issue>
 
     <issue
@@ -1350,7 +1240,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="61"
+            line="66"
             column="12"/>
     </issue>
 
@@ -1361,7 +1251,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="72"
+            line="77"
             column="12"/>
     </issue>
 
@@ -1372,7 +1262,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="129"
+            line="134"
             column="24"/>
     </issue>
 
@@ -1383,7 +1273,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="129"
+            line="134"
             column="41"/>
     </issue>
 
@@ -1394,7 +1284,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="130"
+            line="135"
             column="13"/>
     </issue>
 
@@ -1405,7 +1295,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="140"
+            line="145"
             column="12"/>
     </issue>
 
@@ -1416,7 +1306,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="151"
+            line="156"
             column="12"/>
     </issue>
 
@@ -1427,52 +1317,41 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="162"
+            line="167"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                ~~~~~~">
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="36"
-            column="33"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
+            line="183"
+            column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="36"
-            column="50"/>
+            line="45"
+            column="22"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public boolean isExtensionAvailable(String cameraId,"
-        errorLine2="                                        ~~~~~~">
+        errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="40"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            CameraCharacteristics cameraCharacteristics) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="41"
-            column="13"/>
+            line="45"
+            column="39"/>
     </issue>
 
     <issue
@@ -1482,7 +1361,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="47"
+            line="56"
             column="12"/>
     </issue>
 
@@ -1493,7 +1372,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="58"
+            line="67"
             column="12"/>
     </issue>
 
@@ -1504,7 +1383,18 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="63"
+            line="72"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
+            line="77"
             column="12"/>
     </issue>
 
@@ -1515,7 +1405,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="68"
+            line="82"
             column="24"/>
     </issue>
 
@@ -1526,7 +1416,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="68"
+            line="82"
             column="41"/>
     </issue>
 
@@ -1537,7 +1427,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="69"
+            line="83"
             column="13"/>
     </issue>
 
@@ -1548,7 +1438,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="79"
+            line="93"
             column="12"/>
     </issue>
 
@@ -1559,7 +1449,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="90"
+            line="104"
             column="12"/>
     </issue>
 
@@ -1570,7 +1460,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="101"
+            line="115"
             column="12"/>
     </issue>
 
@@ -1581,7 +1471,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="43"
+            line="52"
             column="34"/>
     </issue>
 
@@ -1592,30 +1482,30 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="43"
+            line="52"
             column="51"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics);"
-        errorLine2="                         ~~~~~~">
+        errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
+        errorLine2="              ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="51"
-            column="26"/>
+            line="63"
+            column="15"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void enableExtension(String cameraId, CameraCharacteristics cameraCharacteristics);"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="51"
-            column="43"/>
+            line="63"
+            column="32"/>
     </issue>
 
     <issue
@@ -1625,7 +1515,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="64"
+            line="76"
             column="5"/>
     </issue>
 
@@ -1636,7 +1526,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="67"
+            line="79"
             column="5"/>
     </issue>
 
@@ -1647,7 +1537,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="75"
+            line="94"
             column="5"/>
     </issue>
 
@@ -1658,7 +1548,7 @@
         errorLine2="                 ~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"
-            line="37"
+            line="39"
             column="18"/>
     </issue>
 
@@ -1669,7 +1559,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"
-            line="37"
+            line="39"
             column="31"/>
     </issue>
 
@@ -1680,7 +1570,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"
-            line="30"
+            line="34"
             column="26"/>
     </issue>
 
@@ -1691,7 +1581,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"
-            line="40"
+            line="44"
             column="29"/>
     </issue>
 
@@ -1702,7 +1592,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"
-            line="33"
+            line="35"
             column="5"/>
     </issue>
 
@@ -1713,7 +1603,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"
-            line="33"
+            line="35"
             column="30"/>
     </issue>
 
diff --git a/car/core/lint-baseline.xml b/car/core/lint-baseline.xml
index af7632a..bac21aa 100644
--- a/car/core/lint-baseline.xml
+++ b/car/core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -1163,7 +1163,7 @@
         errorLine2="                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="894"
+            line="892"
             column="33"/>
     </issue>
 
@@ -1174,7 +1174,7 @@
         errorLine2="                                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="899"
+            line="897"
             column="35"/>
     </issue>
 
@@ -1185,7 +1185,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="934"
+            line="932"
             column="45"/>
     </issue>
 
@@ -1196,7 +1196,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="1115"
+            line="1113"
             column="37"/>
     </issue>
 
@@ -1207,7 +1207,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="1517"
+            line="1515"
             column="12"/>
     </issue>
 
@@ -1218,7 +1218,7 @@
         errorLine2="                                       ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="1529"
+            line="1527"
             column="40"/>
     </issue>
 
@@ -1229,7 +1229,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="1543"
+            line="1541"
             column="46"/>
     </issue>
 
@@ -1240,7 +1240,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="1553"
+            line="1551"
             column="49"/>
     </issue>
 
@@ -1251,7 +1251,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="1654"
+            line="1652"
             column="32"/>
     </issue>
 
@@ -1262,7 +1262,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/widget/PagedListView.java"
-            line="1658"
+            line="1656"
             column="42"/>
     </issue>
 
diff --git a/car/moderator/lint-baseline.xml b/car/moderator/lint-baseline.xml
index 66d7d4a..315970e 100644
--- a/car/moderator/lint-baseline.xml
+++ b/car/moderator/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/collection/collection/lint-baseline.xml b/collection/collection/lint-baseline.xml
index 1c7466d..d0fb39b 100644
--- a/collection/collection/lint-baseline.xml
+++ b/collection/collection/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -63,7 +63,7 @@
         errorLine2="           ~">
         <location
             file="src/main/java/androidx/collection/ArraySet.java"
-            line="446"
+            line="510"
             column="12"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/collection/ArraySet.java"
-            line="693"
+            line="759"
             column="12"/>
     </issue>
 
diff --git a/concurrent/futures/lint-baseline.xml b/concurrent/futures/lint-baseline.xml
index a81ea10..05fdc84 100644
--- a/concurrent/futures/lint-baseline.xml
+++ b/concurrent/futures/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/contentpager/lint-baseline.xml b/contentpager/lint-baseline.xml
index 523a850..b80103e 100644
--- a/contentpager/lint-baseline.xml
+++ b/contentpager/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/coordinatorlayout/lint-baseline.xml b/coordinatorlayout/lint-baseline.xml
index 207ce14..25ab232 100644
--- a/coordinatorlayout/lint-baseline.xml
+++ b/coordinatorlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/core/core-ktx/lint-baseline.xml b/core/core-ktx/lint-baseline.xml
index ff1797c..1720004 100644
--- a/core/core-ktx/lint-baseline.xml
+++ b/core/core-ktx/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/core/core/lint-baseline.xml b/core/core/lint-baseline.xml
index dfec82d..a40b960 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="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
diff --git a/cursoradapter/lint-baseline.xml b/cursoradapter/lint-baseline.xml
index 19c6c0e..1fc537a 100644
--- a/cursoradapter/lint-baseline.xml
+++ b/cursoradapter/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -74,7 +74,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="134"
+            line="136"
             column="26"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="134"
+            line="136"
             column="43"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="150"
+            line="153"
             column="26"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="150"
+            line="153"
             column="43"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="163"
+            line="166"
             column="26"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="163"
+            line="166"
             column="43"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                        ~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="172"
+            line="176"
             column="25"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="172"
+            line="176"
             column="42"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="207"
+            line="212"
             column="12"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="227"
+            line="232"
             column="12"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="261"
+            line="266"
             column="12"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="                                      ~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="261"
+            line="266"
             column="39"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="                                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="261"
+            line="266"
             column="57"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="279"
+            line="284"
             column="12"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="279"
+            line="284"
             column="47"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="                                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="279"
+            line="284"
             column="65"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="                    ~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="303"
+            line="308"
             column="21"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="303"
+            line="308"
             column="34"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="303"
+            line="308"
             column="51"/>
     </issue>
 
@@ -283,7 +283,7 @@
         errorLine2="                                                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="303"
+            line="308"
             column="66"/>
     </issue>
 
@@ -294,7 +294,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="313"
+            line="318"
             column="12"/>
     </issue>
 
@@ -305,7 +305,7 @@
         errorLine2="                                ~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="313"
+            line="318"
             column="33"/>
     </issue>
 
@@ -316,7 +316,7 @@
         errorLine2="                                                 ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="313"
+            line="318"
             column="50"/>
     </issue>
 
@@ -327,7 +327,7 @@
         errorLine2="                                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="313"
+            line="318"
             column="65"/>
     </issue>
 
@@ -338,7 +338,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="324"
+            line="329"
             column="35"/>
     </issue>
 
@@ -349,7 +349,7 @@
         errorLine2="                                             ~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="324"
+            line="329"
             column="46"/>
     </issue>
 
@@ -360,7 +360,7 @@
         errorLine2="                                                              ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="324"
+            line="329"
             column="63"/>
     </issue>
 
@@ -371,7 +371,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="333"
+            line="338"
             column="30"/>
     </issue>
 
@@ -382,7 +382,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="350"
+            line="355"
             column="12"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="350"
+            line="355"
             column="30"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="386"
+            line="391"
             column="12"/>
     </issue>
 
@@ -415,7 +415,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="386"
+            line="391"
             column="41"/>
     </issue>
 
@@ -426,7 +426,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="416"
+            line="421"
             column="12"/>
     </issue>
 
@@ -437,7 +437,7 @@
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="416"
+            line="421"
             column="46"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="425"
+            line="430"
             column="12"/>
     </issue>
 
@@ -459,7 +459,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="441"
+            line="446"
             column="12"/>
     </issue>
 
@@ -470,7 +470,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="457"
+            line="462"
             column="40"/>
     </issue>
 
diff --git a/customview/lint-baseline.xml b/customview/lint-baseline.xml
index 5bea09e..1957f7b 100644
--- a/customview/lint-baseline.xml
+++ b/customview/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/drawerlayout/lint-baseline.xml b/drawerlayout/lint-baseline.xml
index f004bba..dbe1301 100644
--- a/drawerlayout/lint-baseline.xml
+++ b/drawerlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/dynamic-animation/lint-baseline.xml b/dynamic-animation/lint-baseline.xml
index 73c34a2..f6415ad 100644
--- a/dynamic-animation/lint-baseline.xml
+++ b/dynamic-animation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/emoji/appcompat/lint-baseline.xml b/emoji/appcompat/lint-baseline.xml
index 31ca54d..c94eae8 100644
--- a/emoji/appcompat/lint-baseline.xml
+++ b/emoji/appcompat/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/emoji/core/lint-baseline.xml b/emoji/core/lint-baseline.xml
index ab57705..1968bbf8 100644
--- a/emoji/core/lint-baseline.xml
+++ b/emoji/core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
diff --git a/exifinterface/lint-baseline.xml b/exifinterface/lint-baseline.xml
index 47682e8..f98491b 100644
--- a/exifinterface/lint-baseline.xml
+++ b/exifinterface/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -8,7 +8,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4749"
+            line="4842"
             column="31"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="4794"
+            line="4887"
             column="28"/>
     </issue>
 
diff --git a/graphics/drawable/animated/lint-baseline.xml b/graphics/drawable/animated/lint-baseline.xml
index 4e734c8..977d16c 100644
--- a/graphics/drawable/animated/lint-baseline.xml
+++ b/graphics/drawable/animated/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/graphics/drawable/static/lint-baseline.xml b/graphics/drawable/static/lint-baseline.xml
index 87ae07e..99fe1df 100644
--- a/graphics/drawable/static/lint-baseline.xml
+++ b/graphics/drawable/static/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
diff --git a/gridlayout/lint-baseline.xml b/gridlayout/lint-baseline.xml
index ce7233a..efc5a0b 100644
--- a/gridlayout/lint-baseline.xml
+++ b/gridlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/heifwriter/lint-baseline.xml b/heifwriter/lint-baseline.xml
index 5cd9a92..97cf4f3 100644
--- a/heifwriter/lint-baseline.xml
+++ b/heifwriter/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/leanback-preference/lint-baseline.xml b/leanback-preference/lint-baseline.xml
index ecd39ce..aab34a02 100644
--- a/leanback-preference/lint-baseline.xml
+++ b/leanback-preference/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/leanback/lint-baseline.xml b/leanback/lint-baseline.xml
index 0378762..0c78020 100644
--- a/leanback/lint-baseline.xml
+++ b/leanback/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -8,7 +8,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="493"
+            line="495"
             column="20"/>
     </issue>
 
@@ -71,7 +71,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="286"
+            line="288"
             column="20"/>
     </issue>
 
@@ -291,7 +291,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="295"
+            line="297"
             column="41"/>
     </issue>
 
@@ -302,7 +302,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="334"
+            line="336"
             column="16"/>
     </issue>
 
@@ -313,7 +313,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="342"
+            line="344"
             column="16"/>
     </issue>
 
@@ -324,7 +324,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="350"
+            line="352"
             column="16"/>
     </issue>
 
@@ -335,7 +335,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="357"
+            line="359"
             column="16"/>
     </issue>
 
@@ -346,7 +346,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="364"
+            line="366"
             column="16"/>
     </issue>
 
@@ -357,7 +357,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="385"
+            line="387"
             column="16"/>
     </issue>
 
@@ -368,7 +368,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="392"
+            line="394"
             column="16"/>
     </issue>
 
@@ -379,7 +379,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="399"
+            line="401"
             column="16"/>
     </issue>
 
@@ -390,7 +390,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="406"
+            line="408"
             column="16"/>
     </issue>
 
@@ -401,7 +401,7 @@
         errorLine2="               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="413"
+            line="415"
             column="16"/>
     </issue>
 
@@ -412,7 +412,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="420"
+            line="422"
             column="16"/>
     </issue>
 
@@ -423,7 +423,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="426"
+            line="428"
             column="15"/>
     </issue>
 
@@ -434,7 +434,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="426"
+            line="428"
             column="59"/>
     </issue>
 
@@ -445,7 +445,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="452"
+            line="454"
             column="40"/>
     </issue>
 
@@ -456,7 +456,7 @@
         errorLine2="                                                                   ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="452"
+            line="454"
             column="68"/>
     </issue>
 
@@ -467,7 +467,7 @@
         errorLine2="                                    ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="470"
+            line="472"
             column="37"/>
     </issue>
 
@@ -478,7 +478,7 @@
         errorLine2="                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="509"
+            line="511"
             column="48"/>
     </issue>
 
@@ -489,7 +489,7 @@
         errorLine2="                                                              ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="509"
+            line="511"
             column="63"/>
     </issue>
 
@@ -500,7 +500,7 @@
         errorLine2="                                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="517"
+            line="519"
             column="41"/>
     </issue>
 
@@ -511,7 +511,7 @@
         errorLine2="                                     ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="529"
+            line="531"
             column="38"/>
     </issue>
 
@@ -522,7 +522,7 @@
         errorLine2="                                       ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="559"
+            line="561"
             column="40"/>
     </issue>
 
@@ -533,7 +533,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/AbstractMediaItemPresenter.java"
-            line="571"
+            line="573"
             column="37"/>
     </issue>
 
@@ -841,7 +841,7 @@
         errorLine2="                                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ArrayObjectAdapter.java"
-            line="126"
+            line="127"
             column="35"/>
     </issue>
 
@@ -852,7 +852,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ArrayObjectAdapter.java"
-            line="141"
+            line="142"
             column="27"/>
     </issue>
 
@@ -863,7 +863,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ArrayObjectAdapter.java"
-            line="174"
+            line="175"
             column="39"/>
     </issue>
 
@@ -874,7 +874,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ArrayObjectAdapter.java"
-            line="215"
+            line="217"
             column="16"/>
     </issue>
 
@@ -885,7 +885,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ArrayObjectAdapter.java"
-            line="240"
+            line="243"
             column="32"/>
     </issue>
 
@@ -896,7 +896,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ArrayObjectAdapter.java"
-            line="240"
+            line="243"
             column="53"/>
     </issue>
 
@@ -2183,7 +2183,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="301"
+            line="302"
             column="32"/>
     </issue>
 
@@ -2194,7 +2194,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="310"
+            line="311"
             column="30"/>
     </issue>
 
@@ -2205,7 +2205,7 @@
         errorLine2="                                   ~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="408"
+            line="409"
             column="36"/>
     </issue>
 
@@ -2216,7 +2216,7 @@
         errorLine2="                     ~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="412"
+            line="413"
             column="22"/>
     </issue>
 
@@ -2227,7 +2227,7 @@
         errorLine2="                     ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="479"
+            line="480"
             column="22"/>
     </issue>
 
@@ -2238,7 +2238,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="500"
+            line="501"
             column="9"/>
     </issue>
 
@@ -2249,7 +2249,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="514"
+            line="515"
             column="9"/>
     </issue>
 
@@ -2260,7 +2260,7 @@
         errorLine2="                                       ~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="527"
+            line="528"
             column="40"/>
     </issue>
 
@@ -2271,7 +2271,7 @@
         errorLine2="                     ~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="534"
+            line="535"
             column="22"/>
     </issue>
 
@@ -2282,7 +2282,7 @@
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="540"
+            line="541"
             column="32"/>
     </issue>
 
@@ -2293,7 +2293,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="546"
+            line="547"
             column="50"/>
     </issue>
 
@@ -2304,7 +2304,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="552"
+            line="553"
             column="51"/>
     </issue>
 
@@ -2315,7 +2315,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="560"
+            line="561"
             column="47"/>
     </issue>
 
@@ -2326,7 +2326,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="580"
+            line="581"
             column="16"/>
     </issue>
 
@@ -2337,7 +2337,7 @@
         errorLine2="                        ~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="666"
+            line="667"
             column="25"/>
     </issue>
 
@@ -2348,7 +2348,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="666"
+            line="667"
             column="42"/>
     </issue>
 
@@ -2359,7 +2359,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="676"
+            line="677"
             column="16"/>
     </issue>
 
@@ -2370,30 +2370,30 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="676"
+            line="677"
             column="44"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void registerFragment(Class rowClass, FragmentFactory factory) {"
-        errorLine2="                                     ~~~~~">
+        errorLine1="        public void registerFragment(Class&lt;?> rowClass, FragmentFactory factory) {"
+        errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="698"
+            line="700"
             column="38"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void registerFragment(Class rowClass, FragmentFactory factory) {"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~">
+        errorLine1="        public void registerFragment(Class&lt;?> rowClass, FragmentFactory factory) {"
+        errorLine2="                                                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="698"
-            column="54"/>
+            line="700"
+            column="57"/>
     </issue>
 
     <issue
@@ -2403,7 +2403,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="702"
+            line="704"
             column="16"/>
     </issue>
 
@@ -2414,7 +2414,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="702"
+            line="704"
             column="40"/>
     </issue>
 
@@ -2425,7 +2425,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="786"
+            line="788"
             column="19"/>
     </issue>
 
@@ -2436,7 +2436,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="786"
+            line="788"
             column="37"/>
     </issue>
 
@@ -2447,7 +2447,7 @@
         errorLine2="                                                 ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="786"
+            line="788"
             column="50"/>
     </issue>
 
@@ -2458,7 +2458,7 @@
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="871"
+            line="873"
             column="28"/>
     </issue>
 
@@ -2469,7 +2469,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="919"
+            line="921"
             column="18"/>
     </issue>
 
@@ -2480,7 +2480,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="926"
+            line="928"
             column="12"/>
     </issue>
 
@@ -2491,7 +2491,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="933"
+            line="935"
             column="47"/>
     </issue>
 
@@ -2502,7 +2502,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="940"
+            line="942"
             column="12"/>
     </issue>
 
@@ -2513,7 +2513,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="950"
+            line="952"
             column="12"/>
     </issue>
 
@@ -2524,7 +2524,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="961"
+            line="963"
             column="12"/>
     </issue>
 
@@ -2535,7 +2535,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="969"
+            line="971"
             column="12"/>
     </issue>
 
@@ -2546,7 +2546,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="979"
+            line="981"
             column="46"/>
     </issue>
 
@@ -2557,7 +2557,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="989"
+            line="991"
             column="12"/>
     </issue>
 
@@ -2568,7 +2568,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1033"
+            line="1035"
             column="45"/>
     </issue>
 
@@ -2579,7 +2579,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1191"
+            line="1193"
             column="37"/>
     </issue>
 
@@ -2590,7 +2590,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1204"
+            line="1206"
             column="26"/>
     </issue>
 
@@ -2601,7 +2601,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1259"
+            line="1261"
             column="12"/>
     </issue>
 
@@ -2612,7 +2612,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1264"
+            line="1266"
             column="12"/>
     </issue>
 
@@ -2623,7 +2623,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1264"
+            line="1266"
             column="30"/>
     </issue>
 
@@ -2634,7 +2634,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1264"
+            line="1266"
             column="55"/>
     </issue>
 
@@ -2645,7 +2645,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1265"
+            line="1267"
             column="13"/>
     </issue>
 
@@ -2656,7 +2656,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1461"
+            line="1463"
             column="44"/>
     </issue>
 
@@ -2667,7 +2667,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1642"
+            line="1644"
             column="12"/>
     </issue>
 
@@ -2678,7 +2678,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1671"
+            line="1673"
             column="19"/>
     </issue>
 
@@ -2689,7 +2689,7 @@
         errorLine2="              ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1816"
+            line="1818"
             column="15"/>
     </issue>
 
@@ -2700,7 +2700,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseFragment.java"
-            line="1822"
+            line="1824"
             column="42"/>
     </issue>
 
@@ -3202,23 +3202,23 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void registerFragment(Class rowClass, FragmentFactory factory) {"
-        errorLine2="                                     ~~~~~">
+        errorLine1="        public void registerFragment(Class&lt;?> rowClass, FragmentFactory factory) {"
+        errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="675"
+            line="676"
             column="38"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public void registerFragment(Class rowClass, FragmentFactory factory) {"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~">
+        errorLine1="        public void registerFragment(Class&lt;?> rowClass, FragmentFactory factory) {"
+        errorLine2="                                                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="675"
-            column="54"/>
+            line="676"
+            column="57"/>
     </issue>
 
     <issue
@@ -3228,7 +3228,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="679"
+            line="680"
             column="16"/>
     </issue>
 
@@ -3239,7 +3239,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="679"
+            line="680"
             column="40"/>
     </issue>
 
@@ -3250,7 +3250,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="763"
+            line="764"
             column="19"/>
     </issue>
 
@@ -3261,7 +3261,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="763"
+            line="764"
             column="37"/>
     </issue>
 
@@ -3272,7 +3272,7 @@
         errorLine2="                                                 ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="763"
+            line="764"
             column="50"/>
     </issue>
 
@@ -3283,7 +3283,7 @@
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="848"
+            line="849"
             column="28"/>
     </issue>
 
@@ -3294,7 +3294,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="896"
+            line="897"
             column="18"/>
     </issue>
 
@@ -3305,7 +3305,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="903"
+            line="904"
             column="12"/>
     </issue>
 
@@ -3316,7 +3316,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="910"
+            line="911"
             column="47"/>
     </issue>
 
@@ -3327,7 +3327,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="917"
+            line="918"
             column="12"/>
     </issue>
 
@@ -3338,7 +3338,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="927"
+            line="928"
             column="12"/>
     </issue>
 
@@ -3349,7 +3349,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="938"
+            line="939"
             column="12"/>
     </issue>
 
@@ -3360,7 +3360,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="946"
+            line="947"
             column="12"/>
     </issue>
 
@@ -3371,7 +3371,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="956"
+            line="957"
             column="46"/>
     </issue>
 
@@ -3382,7 +3382,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="966"
+            line="967"
             column="12"/>
     </issue>
 
@@ -3393,7 +3393,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1010"
+            line="1011"
             column="45"/>
     </issue>
 
@@ -3404,7 +3404,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1168"
+            line="1169"
             column="37"/>
     </issue>
 
@@ -3415,7 +3415,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1181"
+            line="1182"
             column="26"/>
     </issue>
 
@@ -3426,7 +3426,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1236"
+            line="1237"
             column="12"/>
     </issue>
 
@@ -3437,7 +3437,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1241"
+            line="1242"
             column="12"/>
     </issue>
 
@@ -3448,7 +3448,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1241"
+            line="1242"
             column="30"/>
     </issue>
 
@@ -3459,7 +3459,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1241"
+            line="1242"
             column="55"/>
     </issue>
 
@@ -3470,7 +3470,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1242"
+            line="1243"
             column="13"/>
     </issue>
 
@@ -3481,7 +3481,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1438"
+            line="1439"
             column="44"/>
     </issue>
 
@@ -3492,7 +3492,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1619"
+            line="1620"
             column="12"/>
     </issue>
 
@@ -3503,7 +3503,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1648"
+            line="1649"
             column="19"/>
     </issue>
 
@@ -3514,7 +3514,7 @@
         errorLine2="              ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1793"
+            line="1794"
             column="15"/>
     </issue>
 
@@ -3525,7 +3525,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/BrowseSupportFragment.java"
-            line="1799"
+            line="1800"
             column="42"/>
     </issue>
 
@@ -4306,7 +4306,7 @@
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="373"
+            line="374"
             column="28"/>
     </issue>
 
@@ -4317,7 +4317,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="391"
+            line="392"
             column="12"/>
     </issue>
 
@@ -4328,7 +4328,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="398"
+            line="399"
             column="47"/>
     </issue>
 
@@ -4339,7 +4339,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="405"
+            line="406"
             column="46"/>
     </issue>
 
@@ -4350,7 +4350,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="417"
+            line="418"
             column="12"/>
     </issue>
 
@@ -4361,7 +4361,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="422"
+            line="423"
             column="26"/>
     </issue>
 
@@ -4372,7 +4372,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="443"
+            line="444"
             column="12"/>
     </issue>
 
@@ -4383,7 +4383,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="443"
+            line="444"
             column="30"/>
     </issue>
 
@@ -4394,7 +4394,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="443"
+            line="444"
             column="55"/>
     </issue>
 
@@ -4405,7 +4405,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="444"
+            line="445"
             column="13"/>
     </issue>
 
@@ -4416,7 +4416,7 @@
         errorLine2="              ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="495"
+            line="496"
             column="15"/>
     </issue>
 
@@ -4427,7 +4427,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="495"
+            line="496"
             column="33"/>
     </issue>
 
@@ -4438,7 +4438,7 @@
         errorLine2="                                                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="495"
+            line="496"
             column="58"/>
     </issue>
 
@@ -4449,7 +4449,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="496"
+            line="497"
             column="13"/>
     </issue>
 
@@ -4460,7 +4460,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="501"
+            line="502"
             column="12"/>
     </issue>
 
@@ -4471,7 +4471,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="501"
+            line="502"
             column="36"/>
     </issue>
 
@@ -4482,7 +4482,7 @@
         errorLine2="                                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="501"
+            line="502"
             column="61"/>
     </issue>
 
@@ -4493,7 +4493,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="502"
+            line="503"
             column="36"/>
     </issue>
 
@@ -4504,7 +4504,7 @@
         errorLine2="                                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="522"
+            line="523"
             column="35"/>
     </issue>
 
@@ -4515,7 +4515,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="533"
+            line="534"
             column="53"/>
     </issue>
 
@@ -4526,7 +4526,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="563"
+            line="564"
             column="12"/>
     </issue>
 
@@ -4537,7 +4537,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="725"
+            line="726"
             column="35"/>
     </issue>
 
@@ -4548,7 +4548,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="725"
+            line="726"
             column="59"/>
     </issue>
 
@@ -4559,7 +4559,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="750"
+            line="751"
             column="50"/>
     </issue>
 
@@ -4570,7 +4570,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="751"
+            line="752"
             column="13"/>
     </issue>
 
@@ -4581,7 +4581,7 @@
         errorLine2="              ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="782"
+            line="783"
             column="15"/>
     </issue>
 
@@ -4592,7 +4592,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="788"
+            line="789"
             column="42"/>
     </issue>
 
@@ -4603,7 +4603,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsFragment.java"
-            line="815"
+            line="816"
             column="12"/>
     </issue>
 
@@ -5087,7 +5087,7 @@
         errorLine2="                          ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="266"
+            line="267"
             column="27"/>
     </issue>
 
@@ -5098,7 +5098,7 @@
         errorLine2="                                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="266"
+            line="267"
             column="42"/>
     </issue>
 
@@ -5109,7 +5109,7 @@
         errorLine2="                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="306"
+            line="307"
             column="40"/>
     </issue>
 
@@ -5120,7 +5120,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="315"
+            line="316"
             column="44"/>
     </issue>
 
@@ -5131,7 +5131,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="322"
+            line="323"
             column="12"/>
     </issue>
 
@@ -5142,7 +5142,7 @@
         errorLine2="                                                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="370"
+            line="371"
             column="55"/>
     </issue>
 
@@ -5153,7 +5153,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="371"
+            line="372"
             column="13"/>
     </issue>
 
@@ -5164,7 +5164,7 @@
         errorLine2="                                                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="391"
+            line="392"
             column="55"/>
     </issue>
 
@@ -5175,7 +5175,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="392"
+            line="393"
             column="13"/>
     </issue>
 
@@ -5186,7 +5186,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="405"
+            line="406"
             column="38"/>
     </issue>
 
@@ -5197,7 +5197,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="413"
+            line="414"
             column="15"/>
     </issue>
 
@@ -5208,7 +5208,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="413"
+            line="414"
             column="59"/>
     </issue>
 
@@ -5219,7 +5219,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="545"
+            line="546"
             column="40"/>
     </issue>
 
@@ -5230,7 +5230,7 @@
         errorLine2="                                                                       ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="545"
+            line="546"
             column="72"/>
     </issue>
 
@@ -5241,7 +5241,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="558"
+            line="559"
             column="42"/>
     </issue>
 
@@ -5252,7 +5252,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="574"
+            line="575"
             column="41"/>
     </issue>
 
@@ -5263,7 +5263,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="584"
+            line="585"
             column="46"/>
     </issue>
 
@@ -5274,7 +5274,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/DetailsOverviewRowPresenter.java"
-            line="593"
+            line="594"
             column="48"/>
     </issue>
 
@@ -5450,7 +5450,7 @@
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="368"
+            line="369"
             column="28"/>
     </issue>
 
@@ -5461,7 +5461,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="386"
+            line="387"
             column="12"/>
     </issue>
 
@@ -5472,7 +5472,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="393"
+            line="394"
             column="47"/>
     </issue>
 
@@ -5483,7 +5483,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="400"
+            line="401"
             column="46"/>
     </issue>
 
@@ -5494,7 +5494,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="412"
+            line="413"
             column="12"/>
     </issue>
 
@@ -5505,7 +5505,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="417"
+            line="418"
             column="26"/>
     </issue>
 
@@ -5516,7 +5516,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="438"
+            line="439"
             column="12"/>
     </issue>
 
@@ -5527,7 +5527,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="438"
+            line="439"
             column="30"/>
     </issue>
 
@@ -5538,7 +5538,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="438"
+            line="439"
             column="55"/>
     </issue>
 
@@ -5549,7 +5549,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="439"
+            line="440"
             column="13"/>
     </issue>
 
@@ -5560,7 +5560,7 @@
         errorLine2="              ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="490"
+            line="491"
             column="15"/>
     </issue>
 
@@ -5571,7 +5571,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="490"
+            line="491"
             column="33"/>
     </issue>
 
@@ -5582,7 +5582,7 @@
         errorLine2="                                                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="490"
+            line="491"
             column="58"/>
     </issue>
 
@@ -5593,7 +5593,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="491"
+            line="492"
             column="13"/>
     </issue>
 
@@ -5604,7 +5604,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="496"
+            line="497"
             column="12"/>
     </issue>
 
@@ -5615,7 +5615,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="496"
+            line="497"
             column="36"/>
     </issue>
 
@@ -5626,7 +5626,7 @@
         errorLine2="                                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="496"
+            line="497"
             column="61"/>
     </issue>
 
@@ -5637,7 +5637,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="497"
+            line="498"
             column="36"/>
     </issue>
 
@@ -5648,7 +5648,7 @@
         errorLine2="                                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="517"
+            line="518"
             column="35"/>
     </issue>
 
@@ -5659,7 +5659,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="528"
+            line="529"
             column="53"/>
     </issue>
 
@@ -5670,7 +5670,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="558"
+            line="559"
             column="12"/>
     </issue>
 
@@ -5681,7 +5681,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="720"
+            line="721"
             column="35"/>
     </issue>
 
@@ -5692,7 +5692,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="720"
+            line="721"
             column="59"/>
     </issue>
 
@@ -5703,7 +5703,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="745"
+            line="746"
             column="50"/>
     </issue>
 
@@ -5714,7 +5714,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="746"
+            line="747"
             column="13"/>
     </issue>
 
@@ -5725,7 +5725,7 @@
         errorLine2="              ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="777"
+            line="778"
             column="15"/>
     </issue>
 
@@ -5736,7 +5736,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="783"
+            line="784"
             column="42"/>
     </issue>
 
@@ -5747,7 +5747,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/DetailsSupportFragment.java"
-            line="810"
+            line="811"
             column="12"/>
     </issue>
 
@@ -6638,7 +6638,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="166"
+            line="167"
             column="19"/>
     </issue>
 
@@ -6649,7 +6649,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="172"
+            line="173"
             column="48"/>
     </issue>
 
@@ -6660,7 +6660,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="178"
+            line="179"
             column="39"/>
     </issue>
 
@@ -6671,7 +6671,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="186"
+            line="187"
             column="49"/>
     </issue>
 
@@ -6682,7 +6682,7 @@
         errorLine2="                          ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="308"
+            line="310"
             column="27"/>
     </issue>
 
@@ -6693,7 +6693,7 @@
         errorLine2="                                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="308"
+            line="310"
             column="42"/>
     </issue>
 
@@ -6704,7 +6704,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="309"
+            line="311"
             column="17"/>
     </issue>
 
@@ -6715,7 +6715,7 @@
         errorLine2="                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="337"
+            line="339"
             column="22"/>
     </issue>
 
@@ -6726,7 +6726,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="344"
+            line="346"
             column="22"/>
     </issue>
 
@@ -6737,7 +6737,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="351"
+            line="353"
             column="22"/>
     </issue>
 
@@ -6748,7 +6748,7 @@
         errorLine2="                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="358"
+            line="360"
             column="22"/>
     </issue>
 
@@ -6759,7 +6759,7 @@
         errorLine2="                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="365"
+            line="367"
             column="22"/>
     </issue>
 
@@ -6770,7 +6770,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="400"
+            line="402"
             column="49"/>
     </issue>
 
@@ -6781,7 +6781,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="411"
+            line="413"
             column="49"/>
     </issue>
 
@@ -6792,7 +6792,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="412"
+            line="414"
             column="13"/>
     </issue>
 
@@ -6803,7 +6803,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="422"
+            line="424"
             column="44"/>
     </issue>
 
@@ -6814,7 +6814,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="429"
+            line="431"
             column="12"/>
     </issue>
 
@@ -6825,7 +6825,7 @@
         errorLine2="                                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="521"
+            line="523"
             column="35"/>
     </issue>
 
@@ -6836,7 +6836,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="533"
+            line="535"
             column="15"/>
     </issue>
 
@@ -6847,7 +6847,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/FullWidthDetailsOverviewRowPresenter.java"
-            line="533"
+            line="535"
             column="59"/>
     </issue>
 
@@ -7067,7 +7067,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GridLayoutManager.java"
-            line="2079"
+            line="2082"
             column="39"/>
     </issue>
 
@@ -7254,7 +7254,7 @@
         errorLine2="                           ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="142"
+            line="145"
             column="28"/>
     </issue>
 
@@ -7265,7 +7265,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="151"
+            line="154"
             column="16"/>
     </issue>
 
@@ -7276,7 +7276,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="163"
+            line="166"
             column="42"/>
     </issue>
 
@@ -7287,7 +7287,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="193"
+            line="196"
             column="16"/>
     </issue>
 
@@ -7298,7 +7298,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="221"
+            line="224"
             column="16"/>
     </issue>
 
@@ -7309,7 +7309,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="231"
+            line="234"
             column="16"/>
     </issue>
 
@@ -7320,7 +7320,7 @@
         errorLine2="                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="231"
+            line="234"
             column="24"/>
     </issue>
 
@@ -7331,7 +7331,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="241"
+            line="244"
             column="16"/>
     </issue>
 
@@ -7342,7 +7342,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="251"
+            line="254"
             column="16"/>
     </issue>
 
@@ -7353,7 +7353,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="251"
+            line="254"
             column="28"/>
     </issue>
 
@@ -7364,7 +7364,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="262"
+            line="265"
             column="16"/>
     </issue>
 
@@ -7375,7 +7375,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="272"
+            line="275"
             column="16"/>
     </issue>
 
@@ -7386,7 +7386,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="272"
+            line="275"
             column="30"/>
     </issue>
 
@@ -7397,7 +7397,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="282"
+            line="285"
             column="16"/>
     </issue>
 
@@ -7408,7 +7408,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="292"
+            line="295"
             column="16"/>
     </issue>
 
@@ -7419,7 +7419,7 @@
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="292"
+            line="295"
             column="34"/>
     </issue>
 
@@ -7430,7 +7430,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="303"
+            line="306"
             column="16"/>
     </issue>
 
@@ -7441,7 +7441,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="313"
+            line="316"
             column="16"/>
     </issue>
 
@@ -7452,7 +7452,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="313"
+            line="316"
             column="25"/>
     </issue>
 
@@ -7463,7 +7463,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="322"
+            line="325"
             column="16"/>
     </issue>
 
@@ -7474,7 +7474,7 @@
         errorLine2="                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="322"
+            line="325"
             column="23"/>
     </issue>
 
@@ -7485,7 +7485,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="336"
+            line="339"
             column="16"/>
     </issue>
 
@@ -7496,7 +7496,7 @@
         errorLine2="                                                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="336"
+            line="339"
             column="66"/>
     </issue>
 
@@ -7507,7 +7507,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="346"
+            line="349"
             column="16"/>
     </issue>
 
@@ -7518,7 +7518,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="355"
+            line="358"
             column="16"/>
     </issue>
 
@@ -7529,7 +7529,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="373"
+            line="376"
             column="16"/>
     </issue>
 
@@ -7540,7 +7540,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="391"
+            line="394"
             column="16"/>
     </issue>
 
@@ -7551,7 +7551,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="410"
+            line="413"
             column="16"/>
     </issue>
 
@@ -7562,7 +7562,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="420"
+            line="423"
             column="16"/>
     </issue>
 
@@ -7573,7 +7573,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="431"
+            line="434"
             column="16"/>
     </issue>
 
@@ -7584,7 +7584,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="441"
+            line="444"
             column="16"/>
     </issue>
 
@@ -7595,7 +7595,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="454"
+            line="457"
             column="16"/>
     </issue>
 
@@ -7606,7 +7606,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="469"
+            line="472"
             column="16"/>
     </issue>
 
@@ -7617,7 +7617,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="482"
+            line="485"
             column="16"/>
     </issue>
 
@@ -7628,7 +7628,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="492"
+            line="495"
             column="16"/>
     </issue>
 
@@ -7639,7 +7639,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="501"
+            line="504"
             column="16"/>
     </issue>
 
@@ -7650,7 +7650,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="510"
+            line="513"
             column="16"/>
     </issue>
 
@@ -7661,7 +7661,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="520"
+            line="523"
             column="16"/>
     </issue>
 
@@ -7672,7 +7672,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="530"
+            line="533"
             column="16"/>
     </issue>
 
@@ -7683,7 +7683,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="530"
+            line="533"
             column="29"/>
     </issue>
 
@@ -7694,7 +7694,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="542"
+            line="545"
             column="16"/>
     </issue>
 
@@ -7705,7 +7705,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="552"
+            line="555"
             column="16"/>
     </issue>
 
@@ -7716,7 +7716,7 @@
         errorLine2="                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="552"
+            line="555"
             column="32"/>
     </issue>
 
@@ -7727,7 +7727,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="575"
+            line="578"
             column="24"/>
     </issue>
 
@@ -7738,7 +7738,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="583"
+            line="586"
             column="16"/>
     </issue>
 
@@ -7749,7 +7749,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="627"
+            line="630"
             column="12"/>
     </issue>
 
@@ -7760,7 +7760,7 @@
         errorLine2="                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="635"
+            line="638"
             column="26"/>
     </issue>
 
@@ -7771,7 +7771,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="644"
+            line="647"
             column="12"/>
     </issue>
 
@@ -7782,7 +7782,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="652"
+            line="655"
             column="30"/>
     </issue>
 
@@ -7793,7 +7793,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="661"
+            line="664"
             column="12"/>
     </issue>
 
@@ -7804,7 +7804,7 @@
         errorLine2="                                   ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="670"
+            line="673"
             column="36"/>
     </issue>
 
@@ -7815,7 +7815,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="687"
+            line="690"
             column="12"/>
     </issue>
 
@@ -7826,7 +7826,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="695"
+            line="698"
             column="32"/>
     </issue>
 
@@ -7837,7 +7837,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="703"
+            line="706"
             column="12"/>
     </issue>
 
@@ -7848,7 +7848,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="711"
+            line="714"
             column="27"/>
     </issue>
 
@@ -7859,7 +7859,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="853"
+            line="856"
             column="12"/>
     </issue>
 
@@ -7870,7 +7870,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="881"
+            line="884"
             column="31"/>
     </issue>
 
@@ -7881,7 +7881,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="888"
+            line="891"
             column="12"/>
     </issue>
 
@@ -7892,7 +7892,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="925"
+            line="928"
             column="37"/>
     </issue>
 
@@ -7903,7 +7903,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="925"
+            line="928"
             column="52"/>
     </issue>
 
@@ -7914,7 +7914,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="945"
+            line="948"
             column="40"/>
     </issue>
 
@@ -7925,7 +7925,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedAction.java"
-            line="945"
+            line="948"
             column="55"/>
     </issue>
 
@@ -9058,7 +9058,7 @@
         errorLine2="                           ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="42"
+            line="45"
             column="28"/>
     </issue>
 
@@ -9069,7 +9069,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="56"
+            line="59"
             column="16"/>
     </issue>
 
@@ -9080,7 +9080,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="56"
+            line="59"
             column="35"/>
     </issue>
 
@@ -9091,7 +9091,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="66"
+            line="69"
             column="16"/>
     </issue>
 
@@ -9102,7 +9102,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="76"
+            line="79"
             column="16"/>
     </issue>
 
@@ -9113,7 +9113,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="86"
+            line="89"
             column="16"/>
     </issue>
 
@@ -9124,7 +9124,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="95"
+            line="98"
             column="52"/>
     </issue>
 
@@ -9135,7 +9135,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="112"
+            line="115"
             column="24"/>
     </issue>
 
@@ -9146,7 +9146,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="120"
+            line="123"
             column="16"/>
     </issue>
 
@@ -9157,7 +9157,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="139"
+            line="142"
             column="12"/>
     </issue>
 
@@ -9168,7 +9168,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="180"
+            line="183"
             column="37"/>
     </issue>
 
@@ -9179,7 +9179,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="180"
+            line="183"
             column="52"/>
     </issue>
 
@@ -9190,7 +9190,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="185"
+            line="188"
             column="40"/>
     </issue>
 
@@ -9201,7 +9201,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/GuidedDatePickerAction.java"
-            line="185"
+            line="188"
             column="55"/>
     </issue>
 
@@ -9758,8 +9758,8 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void popBackStackToGuidedStepFragment(Class guidedStepFragmentClass, int flags) {"
-        errorLine2="                                                 ~~~~~">
+        errorLine1="    public void popBackStackToGuidedStepFragment(Class&lt;?> guidedStepFragmentClass, int flags) {"
+        errorLine2="                                                 ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/GuidedStepFragment.java"
             line="1299"
@@ -10330,8 +10330,8 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void popBackStackToGuidedStepSupportFragment(Class guidedStepFragmentClass, int flags) {"
-        errorLine2="                                                        ~~~~~">
+        errorLine1="    public void popBackStackToGuidedStepSupportFragment(Class&lt;?> guidedStepFragmentClass,"
+        errorLine2="                                                        ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/GuidedStepSupportFragment.java"
             line="1294"
@@ -10345,7 +10345,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/GuidedStepSupportFragment.java"
-            line="1356"
+            line="1357"
             column="32"/>
     </issue>
 
@@ -11412,7 +11412,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ItemBridgeAdapter.java"
-            line="415"
+            line="416"
             column="41"/>
     </issue>
 
@@ -11423,7 +11423,7 @@
         errorLine2="            ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ItemBridgeAdapter.java"
-            line="416"
+            line="417"
             column="13"/>
     </issue>
 
@@ -11434,7 +11434,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ItemBridgeAdapter.java"
-            line="430"
+            line="431"
             column="38"/>
     </issue>
 
@@ -11445,7 +11445,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ItemBridgeAdapter.java"
-            line="441"
+            line="442"
             column="48"/>
     </issue>
 
@@ -11456,7 +11456,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ItemBridgeAdapter.java"
-            line="447"
+            line="448"
             column="46"/>
     </issue>
 
@@ -11467,7 +11467,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ItemBridgeAdapter.java"
-            line="457"
+            line="458"
             column="48"/>
     </issue>
 
@@ -11478,7 +11478,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ItemBridgeAdapter.java"
-            line="472"
+            line="473"
             column="12"/>
     </issue>
 
@@ -11907,7 +11907,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="415"
+            line="416"
             column="44"/>
     </issue>
 
@@ -11918,7 +11918,7 @@
         errorLine2="                                    ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="469"
+            line="470"
             column="37"/>
     </issue>
 
@@ -11929,7 +11929,7 @@
         errorLine2="                                   ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="476"
+            line="477"
             column="36"/>
     </issue>
 
@@ -11940,7 +11940,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="484"
+            line="485"
             column="53"/>
     </issue>
 
@@ -11951,7 +11951,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="491"
+            line="492"
             column="18"/>
     </issue>
 
@@ -11962,7 +11962,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="568"
+            line="570"
             column="15"/>
     </issue>
 
@@ -11973,7 +11973,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="568"
+            line="570"
             column="59"/>
     </issue>
 
@@ -11984,7 +11984,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="583"
+            line="586"
             column="49"/>
     </issue>
 
@@ -11995,7 +11995,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="601"
+            line="604"
             column="38"/>
     </issue>
 
@@ -12006,7 +12006,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="642"
+            line="645"
             column="38"/>
     </issue>
 
@@ -12017,7 +12017,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="654"
+            line="657"
             column="40"/>
     </issue>
 
@@ -12028,7 +12028,7 @@
         errorLine2="                                                                       ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="654"
+            line="657"
             column="72"/>
     </issue>
 
@@ -12039,7 +12039,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="664"
+            line="667"
             column="42"/>
     </issue>
 
@@ -12050,7 +12050,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="705"
+            line="708"
             column="34"/>
     </issue>
 
@@ -12061,7 +12061,7 @@
         errorLine2="                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="717"
+            line="720"
             column="43"/>
     </issue>
 
@@ -12072,7 +12072,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="791"
+            line="794"
             column="15"/>
     </issue>
 
@@ -12083,7 +12083,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="810"
+            line="813"
             column="41"/>
     </issue>
 
@@ -12094,7 +12094,7 @@
         errorLine2="                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="835"
+            line="838"
             column="44"/>
     </issue>
 
@@ -12105,7 +12105,7 @@
         errorLine2="                                                                     ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="835"
+            line="838"
             column="70"/>
     </issue>
 
@@ -12116,7 +12116,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="843"
+            line="846"
             column="24"/>
     </issue>
 
@@ -12127,7 +12127,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ListRowPresenter.java"
-            line="850"
+            line="853"
             column="44"/>
     </issue>
 
@@ -13964,7 +13964,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ParallaxEffect.java"
-            line="178"
+            line="179"
             column="40"/>
     </issue>
 
@@ -13975,7 +13975,7 @@
         errorLine2="                                                             ~">
         <location
             file="src/main/java/androidx/leanback/widget/ParallaxEffect.java"
-            line="178"
+            line="179"
             column="62"/>
     </issue>
 
@@ -13986,7 +13986,7 @@
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ParallaxEffect.java"
-            line="179"
+            line="180"
             column="13"/>
     </issue>
 
@@ -13997,7 +13997,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ParallaxEffect.java"
-            line="189"
+            line="190"
             column="18"/>
     </issue>
 
@@ -14008,7 +14008,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ParallaxEffect.java"
-            line="197"
+            line="198"
             column="36"/>
     </issue>
 
@@ -14019,7 +14019,7 @@
         errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ParallaxEffect.java"
-            line="204"
+            line="205"
             column="38"/>
     </issue>
 
@@ -14085,7 +14085,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/ParallaxTarget.java"
-            line="128"
+            line="129"
             column="34"/>
     </issue>
 
@@ -14954,7 +14954,7 @@
         errorLine2="                               ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="216"
+            line="217"
             column="32"/>
     </issue>
 
@@ -14965,7 +14965,7 @@
         errorLine2="                                                ~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="216"
+            line="217"
             column="49"/>
     </issue>
 
@@ -14976,7 +14976,7 @@
         errorLine2="                               ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="227"
+            line="228"
             column="32"/>
     </issue>
 
@@ -14987,7 +14987,7 @@
         errorLine2="                               ~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="228"
+            line="229"
             column="32"/>
     </issue>
 
@@ -14998,7 +14998,7 @@
         errorLine2="                               ~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="229"
+            line="230"
             column="32"/>
     </issue>
 
@@ -15009,7 +15009,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="242"
+            line="243"
             column="37"/>
     </issue>
 
@@ -15020,7 +15020,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="313"
+            line="314"
             column="12"/>
     </issue>
 
@@ -15031,7 +15031,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="320"
+            line="321"
             column="12"/>
     </issue>
 
@@ -15042,7 +15042,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="346"
+            line="347"
             column="32"/>
     </issue>
 
@@ -15053,7 +15053,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="362"
+            line="363"
             column="15"/>
     </issue>
 
@@ -15064,7 +15064,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="363"
+            line="364"
             column="13"/>
     </issue>
 
@@ -15075,7 +15075,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="375"
+            line="376"
             column="41"/>
     </issue>
 
@@ -15086,7 +15086,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="382"
+            line="383"
             column="12"/>
     </issue>
 
@@ -15097,7 +15097,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="392"
+            line="393"
             column="12"/>
     </issue>
 
@@ -15108,7 +15108,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="401"
+            line="402"
             column="41"/>
     </issue>
 
@@ -15119,7 +15119,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="409"
+            line="410"
             column="12"/>
     </issue>
 
@@ -15130,7 +15130,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="444"
+            line="445"
             column="33"/>
     </issue>
 
@@ -15141,7 +15141,7 @@
         errorLine2="                         ~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="453"
+            line="454"
             column="26"/>
     </issue>
 
@@ -15152,7 +15152,7 @@
         errorLine2="                                              ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="453"
+            line="454"
             column="47"/>
     </issue>
 
@@ -15163,7 +15163,7 @@
         errorLine2="                    ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="785"
+            line="786"
             column="21"/>
     </issue>
 
@@ -15174,7 +15174,7 @@
         errorLine2="                    ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="790"
+            line="791"
             column="21"/>
     </issue>
 
@@ -15185,7 +15185,7 @@
         errorLine2="                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="800"
+            line="801"
             column="21"/>
     </issue>
 
@@ -15196,7 +15196,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="823"
+            line="824"
             column="43"/>
     </issue>
 
@@ -15207,7 +15207,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackControlGlue.java"
-            line="831"
+            line="832"
             column="45"/>
     </issue>
 
@@ -15702,7 +15702,7 @@
         errorLine2="                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="204"
+            line="206"
             column="41"/>
     </issue>
 
@@ -15713,7 +15713,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="228"
+            line="230"
             column="44"/>
     </issue>
 
@@ -15724,7 +15724,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="235"
+            line="237"
             column="12"/>
     </issue>
 
@@ -15735,7 +15735,7 @@
         errorLine2="                                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="295"
+            line="297"
             column="33"/>
     </issue>
 
@@ -15746,7 +15746,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="303"
+            line="305"
             column="36"/>
     </issue>
 
@@ -15757,7 +15757,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="311"
+            line="313"
             column="28"/>
     </issue>
 
@@ -15768,7 +15768,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="333"
+            line="335"
             column="15"/>
     </issue>
 
@@ -15779,7 +15779,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="333"
+            line="335"
             column="59"/>
     </issue>
 
@@ -15790,7 +15790,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="374"
+            line="376"
             column="40"/>
     </issue>
 
@@ -15801,7 +15801,7 @@
         errorLine2="                                                                       ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="374"
+            line="376"
             column="72"/>
     </issue>
 
@@ -15812,7 +15812,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="450"
+            line="452"
             column="42"/>
     </issue>
 
@@ -15823,7 +15823,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="465"
+            line="467"
             column="38"/>
     </issue>
 
@@ -15834,7 +15834,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="473"
+            line="475"
             column="46"/>
     </issue>
 
@@ -15845,7 +15845,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackControlsRowPresenter.java"
-            line="482"
+            line="484"
             column="48"/>
     </issue>
 
@@ -15867,7 +15867,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="205"
+            line="206"
             column="12"/>
     </issue>
 
@@ -15878,7 +15878,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="419"
+            line="420"
             column="41"/>
     </issue>
 
@@ -15889,7 +15889,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="428"
+            line="429"
             column="12"/>
     </issue>
 
@@ -15900,7 +15900,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="435"
+            line="436"
             column="49"/>
     </issue>
 
@@ -15911,7 +15911,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="816"
+            line="817"
             column="26"/>
     </issue>
 
@@ -15922,7 +15922,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="923"
+            line="924"
             column="12"/>
     </issue>
 
@@ -15933,7 +15933,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="923"
+            line="924"
             column="30"/>
     </issue>
 
@@ -15944,7 +15944,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="923"
+            line="924"
             column="55"/>
     </issue>
 
@@ -15955,7 +15955,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="924"
+            line="925"
             column="30"/>
     </issue>
 
@@ -15966,7 +15966,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="957"
+            line="958"
             column="33"/>
     </issue>
 
@@ -15977,7 +15977,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="997"
+            line="998"
             column="53"/>
     </issue>
 
@@ -15988,7 +15988,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="1005"
+            line="1006"
             column="52"/>
     </issue>
 
@@ -15999,7 +15999,7 @@
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="1013"
+            line="1014"
             column="60"/>
     </issue>
 
@@ -16010,7 +16010,7 @@
         errorLine2="                               ~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="1037"
+            line="1038"
             column="32"/>
     </issue>
 
@@ -16021,7 +16021,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="1051"
+            line="1052"
             column="41"/>
     </issue>
 
@@ -16032,7 +16032,7 @@
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="1096"
+            line="1097"
             column="28"/>
     </issue>
 
@@ -16043,7 +16043,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="1172"
+            line="1173"
             column="41"/>
     </issue>
 
@@ -16054,7 +16054,7 @@
         errorLine2="                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="1229"
+            line="1230"
             column="43"/>
     </issue>
 
@@ -16065,7 +16065,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackFragment.java"
-            line="1238"
+            line="1239"
             column="12"/>
     </issue>
 
@@ -16439,7 +16439,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="200"
+            line="202"
             column="12"/>
     </issue>
 
@@ -16450,7 +16450,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="414"
+            line="416"
             column="41"/>
     </issue>
 
@@ -16461,7 +16461,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="423"
+            line="425"
             column="12"/>
     </issue>
 
@@ -16472,7 +16472,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="430"
+            line="432"
             column="49"/>
     </issue>
 
@@ -16483,7 +16483,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="811"
+            line="813"
             column="26"/>
     </issue>
 
@@ -16494,7 +16494,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="918"
+            line="920"
             column="12"/>
     </issue>
 
@@ -16505,7 +16505,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="918"
+            line="920"
             column="30"/>
     </issue>
 
@@ -16516,7 +16516,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="918"
+            line="920"
             column="55"/>
     </issue>
 
@@ -16527,7 +16527,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="919"
+            line="921"
             column="30"/>
     </issue>
 
@@ -16538,7 +16538,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="952"
+            line="954"
             column="33"/>
     </issue>
 
@@ -16549,7 +16549,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="992"
+            line="994"
             column="53"/>
     </issue>
 
@@ -16560,7 +16560,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="1000"
+            line="1002"
             column="52"/>
     </issue>
 
@@ -16571,7 +16571,7 @@
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="1008"
+            line="1010"
             column="60"/>
     </issue>
 
@@ -16582,7 +16582,7 @@
         errorLine2="                               ~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="1032"
+            line="1034"
             column="32"/>
     </issue>
 
@@ -16593,7 +16593,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="1046"
+            line="1048"
             column="41"/>
     </issue>
 
@@ -16604,7 +16604,7 @@
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="1091"
+            line="1093"
             column="28"/>
     </issue>
 
@@ -16615,7 +16615,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="1167"
+            line="1169"
             column="41"/>
     </issue>
 
@@ -16626,7 +16626,7 @@
         errorLine2="                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="1224"
+            line="1226"
             column="43"/>
     </issue>
 
@@ -16637,7 +16637,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/app/PlaybackSupportFragment.java"
-            line="1233"
+            line="1235"
             column="12"/>
     </issue>
 
@@ -16736,7 +16736,7 @@
         errorLine2="                                        ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="121"
+            line="123"
             column="41"/>
     </issue>
 
@@ -16747,7 +16747,7 @@
         errorLine2="                                                         ~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="121"
+            line="123"
             column="58"/>
     </issue>
 
@@ -16758,7 +16758,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="126"
+            line="128"
             column="32"/>
     </issue>
 
@@ -16769,7 +16769,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="133"
+            line="135"
             column="43"/>
     </issue>
 
@@ -16780,7 +16780,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="139"
+            line="141"
             column="15"/>
     </issue>
 
@@ -16791,7 +16791,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="168"
+            line="170"
             column="37"/>
     </issue>
 
@@ -16802,7 +16802,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="193"
+            line="195"
             column="33"/>
     </issue>
 
@@ -16813,7 +16813,7 @@
         errorLine2="                         ~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="198"
+            line="200"
             column="26"/>
     </issue>
 
@@ -16824,7 +16824,7 @@
         errorLine2="                                              ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="198"
+            line="200"
             column="47"/>
     </issue>
 
@@ -16835,7 +16835,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="392"
+            line="394"
             column="39"/>
     </issue>
 
@@ -16846,7 +16846,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/media/PlaybackTransportControlGlue.java"
-            line="400"
+            line="402"
             column="18"/>
     </issue>
 
@@ -16901,7 +16901,7 @@
         errorLine2="                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="448"
+            line="449"
             column="22"/>
     </issue>
 
@@ -16912,7 +16912,7 @@
         errorLine2="                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="476"
+            line="477"
             column="22"/>
     </issue>
 
@@ -16923,7 +16923,7 @@
         errorLine2="                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="600"
+            line="602"
             column="41"/>
     </issue>
 
@@ -16934,7 +16934,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="607"
+            line="609"
             column="44"/>
     </issue>
 
@@ -16945,7 +16945,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="614"
+            line="616"
             column="12"/>
     </issue>
 
@@ -16956,7 +16956,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="656"
+            line="658"
             column="28"/>
     </issue>
 
@@ -16967,7 +16967,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="683"
+            line="685"
             column="15"/>
     </issue>
 
@@ -16978,7 +16978,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="683"
+            line="685"
             column="59"/>
     </issue>
 
@@ -17022,7 +17022,7 @@
         errorLine2="                                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="779"
+            line="780"
             column="41"/>
     </issue>
 
@@ -17033,7 +17033,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="811"
+            line="812"
             column="38"/>
     </issue>
 
@@ -17044,7 +17044,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="819"
+            line="820"
             column="46"/>
     </issue>
 
@@ -17055,7 +17055,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/PlaybackTransportRowPresenter.java"
-            line="828"
+            line="829"
             column="48"/>
     </issue>
 
@@ -18309,7 +18309,7 @@
         errorLine2="                                                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="497"
+            line="498"
             column="49"/>
     </issue>
 
@@ -18320,7 +18320,7 @@
         errorLine2="                                     ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="510"
+            line="511"
             column="38"/>
     </issue>
 
@@ -18331,7 +18331,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="528"
+            line="529"
             column="38"/>
     </issue>
 
@@ -18342,7 +18342,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="538"
+            line="539"
             column="39"/>
     </issue>
 
@@ -18353,7 +18353,7 @@
         errorLine2="                                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="550"
+            line="551"
             column="41"/>
     </issue>
 
@@ -18364,7 +18364,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="599"
+            line="600"
             column="40"/>
     </issue>
 
@@ -18375,7 +18375,7 @@
         errorLine2="                                                                        ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="599"
+            line="600"
             column="73"/>
     </issue>
 
@@ -18386,7 +18386,7 @@
         errorLine2="                                       ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="609"
+            line="610"
             column="40"/>
     </issue>
 
@@ -18397,7 +18397,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="609"
+            line="610"
             column="55"/>
     </issue>
 
@@ -18408,7 +18408,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="618"
+            line="619"
             column="42"/>
     </issue>
 
@@ -18419,7 +18419,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="627"
+            line="628"
             column="42"/>
     </issue>
 
@@ -18430,7 +18430,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="636"
+            line="637"
             column="46"/>
     </issue>
 
@@ -18441,7 +18441,7 @@
         errorLine2="                                             ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="643"
+            line="644"
             column="46"/>
     </issue>
 
@@ -18452,7 +18452,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="650"
+            line="651"
             column="48"/>
     </issue>
 
@@ -18463,7 +18463,7 @@
         errorLine2="                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="657"
+            line="658"
             column="48"/>
     </issue>
 
@@ -18474,7 +18474,7 @@
         errorLine2="                       ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="668"
+            line="669"
             column="24"/>
     </issue>
 
@@ -18485,7 +18485,7 @@
         errorLine2="                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/RowPresenter.java"
-            line="681"
+            line="682"
             column="44"/>
     </issue>
 
diff --git a/legacy/core-utils/lint-baseline.xml b/legacy/core-utils/lint-baseline.xml
index ff81b70..46460eb 100644
--- a/legacy/core-utils/lint-baseline.xml
+++ b/legacy/core-utils/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/lifecycle/lifecycle-common/lint-baseline.xml b/lifecycle/lifecycle-common/lint-baseline.xml
index f2fba58..fef7174 100644
--- a/lifecycle/lifecycle-common/lint-baseline.xml
+++ b/lifecycle/lifecycle-common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
diff --git a/lifecycle/lifecycle-livedata-core/lint-baseline.xml b/lifecycle/lifecycle-livedata-core/lint-baseline.xml
index 3e8e72c..4f828bb 100644
--- a/lifecycle/lifecycle-livedata-core/lint-baseline.xml
+++ b/lifecycle/lifecycle-livedata-core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="RestrictedApi"
diff --git a/lifecycle/lifecycle-livedata/lint-baseline.xml b/lifecycle/lifecycle-livedata/lint-baseline.xml
index cac680e..5f38c42 100644
--- a/lifecycle/lifecycle-livedata/lint-baseline.xml
+++ b/lifecycle/lifecycle-livedata/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="RestrictedApi"
diff --git a/lifecycle/lifecycle-reactivestreams/lint-baseline.xml b/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
index 36073ee..bf1672bd 100644
--- a/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
+++ b/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="RestrictedApi"
diff --git a/lifecycle/lifecycle-runtime/lint-baseline.xml b/lifecycle/lifecycle-runtime/lint-baseline.xml
index 2259dc1..9c8c073 100644
--- a/lifecycle/lifecycle-runtime/lint-baseline.xml
+++ b/lifecycle/lifecycle-runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="RestrictedApi"
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml b/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
index 3b702ba..b3ab520 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
+++ b/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
diff --git a/media/lint-baseline.xml b/media/lint-baseline.xml
index cd5114f..78c2797 100644
--- a/media/lint-baseline.xml
+++ b/media/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
diff --git a/media/version-compat-tests/lib/lint-baseline.xml b/media/version-compat-tests/lib/lint-baseline.xml
index c956f6a..c52ac4b 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="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/media2/common/lint-baseline.xml b/media2/common/lint-baseline.xml
index cb8a6cf..8e4683a 100644
--- a/media2/common/lint-baseline.xml
+++ b/media2/common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta05" client="gradle" variant="debug" version="3.5.0-beta05">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -8,29 +8,18 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/common/SessionPlayer.java"
-            line="793"
+            line="811"
             column="31"/>
     </issue>
 
     <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 1, &quot;executor&quot;, in androidx.media2.common.SessionPlayer.registerPlayerCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull PlayerCallback callback) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/common/SessionPlayer.java"
-            line="839"
-            column="13"/>
-    </issue>
-
-    <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="            Executor executor, OnMetadataChangedListener listener) {"
         errorLine2="            ~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/common/MediaItem.java"
-            line="226"
+            line="227"
             column="13"/>
     </issue>
 
@@ -41,7 +30,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/common/MediaItem.java"
-            line="226"
+            line="227"
             column="32"/>
     </issue>
 
@@ -52,7 +41,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/common/MediaItem.java"
-            line="241"
+            line="242"
             column="49"/>
     </issue>
 
@@ -63,7 +52,7 @@
         errorLine2="                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/common/MediaItem.java"
-            line="332"
+            line="333"
             column="32"/>
     </issue>
 
@@ -78,15 +67,4 @@
             column="31"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public static ListenableFuture&lt;PlayerResult> createFuture(int resultCode) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/common/SessionPlayer.java"
-            line="1451"
-            column="23"/>
-    </issue>
-
 </issues>
diff --git a/media2/player/lint-baseline.xml b/media2/player/lint-baseline.xml
index 6295b37..5b64ff9 100644
--- a/media2/player/lint-baseline.xml
+++ b/media2/player/lint-baseline.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0" client="gradle" variant="debug" version="3.5.0">
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 1, &quot;executor&quot;, in androidx.media2.player.MediaPlayer.registerPlayerCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull PlayerCallback callback) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/player/MediaPlayer.java"
-            line="2411"
-            column="13"/>
-    </issue>
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -195,7 +184,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer.java"
-            line="1946"
+            line="1947"
             column="12"/>
     </issue>
 
@@ -206,7 +195,7 @@
         errorLine2="                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="827"
+            line="825"
             column="17"/>
     </issue>
 
@@ -217,7 +206,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="827"
+            line="825"
             column="34"/>
     </issue>
 
@@ -228,7 +217,7 @@
         errorLine2="                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="847"
+            line="845"
             column="17"/>
     </issue>
 
@@ -239,7 +228,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="847"
+            line="845"
             column="34"/>
     </issue>
 
@@ -250,7 +239,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="847"
+            line="845"
             column="50"/>
     </issue>
 
@@ -261,7 +250,7 @@
         errorLine2="                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="859"
+            line="857"
             column="17"/>
     </issue>
 
@@ -272,7 +261,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="859"
+            line="857"
             column="34"/>
     </issue>
 
@@ -283,7 +272,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="870"
+            line="868"
             column="28"/>
     </issue>
 
@@ -294,7 +283,7 @@
         errorLine2="                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="870"
+            line="868"
             column="45"/>
     </issue>
 
@@ -305,7 +294,7 @@
         errorLine2="                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="881"
+            line="879"
             column="17"/>
     </issue>
 
@@ -316,7 +305,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="881"
+            line="879"
             column="34"/>
     </issue>
 
@@ -327,7 +316,7 @@
         errorLine2="                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="905"
+            line="903"
             column="17"/>
     </issue>
 
@@ -338,7 +327,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="905"
+            line="903"
             column="34"/>
     </issue>
 
@@ -349,7 +338,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="905"
+            line="903"
             column="50"/>
     </issue>
 
@@ -360,7 +349,7 @@
         errorLine2="                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="914"
+            line="912"
             column="43"/>
     </issue>
 
@@ -371,7 +360,7 @@
         errorLine2="                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1455"
+            line="1453"
             column="26"/>
     </issue>
 
@@ -382,7 +371,7 @@
         errorLine2="                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1455"
+            line="1453"
             column="43"/>
     </issue>
 
@@ -393,7 +382,7 @@
         errorLine2="                              ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1482"
+            line="1480"
             column="31"/>
     </issue>
 
@@ -404,7 +393,7 @@
         errorLine2="                                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1482"
+            line="1480"
             column="48"/>
     </issue>
 
@@ -415,7 +404,7 @@
         errorLine2="                                                               ~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1482"
+            line="1480"
             column="64"/>
     </issue>
 
@@ -426,7 +415,7 @@
         errorLine2="                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1493"
+            line="1491"
             column="17"/>
     </issue>
 
@@ -437,7 +426,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1493"
+            line="1491"
             column="34"/>
     </issue>
 
@@ -448,7 +437,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1717"
+            line="1715"
             column="25"/>
     </issue>
 
@@ -459,7 +448,7 @@
         errorLine2="                        ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1724"
+            line="1722"
             column="25"/>
     </issue>
 
@@ -470,7 +459,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/MediaPlayer2.java"
-            line="1732"
+            line="1730"
             column="37"/>
     </issue>
 
diff --git a/media2/session/lint-baseline.xml b/media2/session/lint-baseline.xml
index 7edd33a..0a54aef 100644
--- a/media2/session/lint-baseline.xml
+++ b/media2/session/lint-baseline.xml
@@ -1,71 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 1, &quot;executor&quot;, in androidx.media2.session.MediaBrowser.Builder.setControllerCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="                @NonNull BrowserCallback callback) {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaBrowser.java"
-            line="327"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 1, &quot;executor&quot;, in androidx.media2.session.MediaController.registerExtraCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            @NonNull ControllerCallback callback) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaController.java"
-            line="1216"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 1, &quot;executor&quot;, in androidx.media2.session.MediaController.Builder.setControllerCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="                @NonNull ControllerCallback callback) {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaController.java"
-            line="1452"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 3, &quot;callbackExecutor&quot;, in androidx.media2.session.MediaLibraryService.MediaLibrarySession.Builder.Builder) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="                    @NonNull MediaLibrarySessionCallback callback) {"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaLibraryService.java"
-            line="272"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LambdaLast"
-        message="Functional interface parameters (such as parameter 1, &quot;executor&quot;, in androidx.media2.session.MediaSession.Builder.setSessionCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="                @NonNull SessionCallback callback) {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaSession.java"
-            line="848"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ListenableFuture&lt;SessionResult> setSurface(@Nullable Surface surface) {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaController.java"
-            line="1114"
-            column="12"/>
-    </issue>
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -74,7 +8,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaController.java"
-            line="1202"
+            line="1261"
             column="29"/>
     </issue>
 
@@ -85,95 +19,29 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaController.java"
-            line="1307"
+            line="1364"
             column="48"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public IBinder onBind(Intent intent) {"
+        errorLine1="    public IBinder onBind(@NonNull Intent intent) {"
         errorLine2="           ~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaLibraryService.java"
-            line="446"
+            line="457"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public IBinder onBind(Intent intent) {"
-        errorLine2="                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaLibraryService.java"
-            line="446"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public MediaNotificationHandler(MediaSessionService service) {"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaNotificationHandler.java"
-            line="71"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onPlayerStateChanged(MediaSession session,"
-        errorLine2="                                     ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaNotificationHandler.java"
-            line="101"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onSessionClosed(MediaSession session) {"
-        errorLine2="                                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaNotificationHandler.java"
-            line="126"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public MediaSessionService.MediaNotification onUpdateNotification(MediaSession session) {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaNotificationHandler.java"
-            line="147"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public MediaSessionService.MediaNotification onUpdateNotification(MediaSession session) {"
-        errorLine2="                                                                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaNotificationHandler.java"
-            line="147"
-            column="71"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public MediaSessionCompat getSessionCompat() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaSession.java"
-            line="383"
+            line="388"
             column="12"/>
     </issue>
 
@@ -184,62 +52,18 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaSessionService.java"
-            line="264"
+            line="262"
             column="31"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static MediaBrowserCompat.MediaItem convertToMediaItem(MediaItem item2) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="135"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static MediaBrowserCompat.MediaItem convertToMediaItem(MediaItem item2) {"
-        errorLine2="                                                                  ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="135"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static List&lt;MediaBrowserCompat.MediaItem> convertToMediaItemList(List&lt;MediaItem> items) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="185"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static List&lt;MediaBrowserCompat.MediaItem> convertToMediaItemList(List&lt;MediaItem> items) {"
-        errorLine2="                                                                            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="185"
-            column="77"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public static MediaItem convertToMediaItem(MediaBrowserCompat.MediaItem item) {"
         errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="202"
+            line="283"
             column="19"/>
     </issue>
 
@@ -250,7 +74,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="202"
+            line="283"
             column="48"/>
     </issue>
 
@@ -261,7 +85,7 @@
         errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="216"
+            line="297"
             column="19"/>
     </issue>
 
@@ -272,7 +96,7 @@
         errorLine2="                                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="216"
+            line="297"
             column="48"/>
     </issue>
 
@@ -283,7 +107,7 @@
         errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="232"
+            line="313"
             column="19"/>
     </issue>
 
@@ -294,7 +118,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="232"
+            line="313"
             column="48"/>
     </issue>
 
@@ -305,7 +129,7 @@
         errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="267"
+            line="348"
             column="19"/>
     </issue>
 
@@ -316,7 +140,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="267"
+            line="348"
             column="48"/>
     </issue>
 
@@ -327,7 +151,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="278"
+            line="359"
             column="19"/>
     </issue>
 
@@ -338,7 +162,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="279"
+            line="360"
             column="13"/>
     </issue>
 
@@ -349,7 +173,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="293"
+            line="374"
             column="19"/>
     </issue>
 
@@ -360,7 +184,7 @@
         errorLine2="                                                                      ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="293"
+            line="374"
             column="71"/>
     </issue>
 
@@ -371,7 +195,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="310"
+            line="391"
             column="19"/>
     </issue>
 
@@ -382,7 +206,7 @@
         errorLine2="                                                                      ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="310"
+            line="391"
             column="71"/>
     </issue>
 
@@ -393,7 +217,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="321"
+            line="402"
             column="19"/>
     </issue>
 
@@ -404,7 +228,7 @@
         errorLine2="                                                         ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="321"
+            line="402"
             column="58"/>
     </issue>
 
@@ -415,7 +239,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="339"
+            line="420"
             column="19"/>
     </issue>
 
@@ -426,7 +250,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="340"
+            line="421"
             column="13"/>
     </issue>
 
@@ -437,7 +261,7 @@
         errorLine2="                                         ~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="360"
+            line="441"
             column="42"/>
     </issue>
 
@@ -448,7 +272,7 @@
         errorLine2="                                                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="360"
+            line="441"
             column="75"/>
     </issue>
 
@@ -459,7 +283,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="452"
+            line="533"
             column="19"/>
     </issue>
 
@@ -470,7 +294,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="452"
+            line="533"
             column="56"/>
     </issue>
 
@@ -481,7 +305,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="469"
+            line="550"
             column="19"/>
     </issue>
 
@@ -492,7 +316,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="469"
+            line="550"
             column="68"/>
     </issue>
 
@@ -503,7 +327,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="504"
+            line="585"
             column="19"/>
     </issue>
 
@@ -514,7 +338,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="504"
+            line="585"
             column="42"/>
     </issue>
 
@@ -525,7 +349,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="540"
+            line="621"
             column="19"/>
     </issue>
 
@@ -536,7 +360,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="540"
+            line="621"
             column="54"/>
     </issue>
 
@@ -547,7 +371,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="570"
+            line="651"
             column="19"/>
     </issue>
 
@@ -558,7 +382,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="571"
+            line="652"
             column="13"/>
     </issue>
 
@@ -569,7 +393,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="586"
+            line="667"
             column="19"/>
     </issue>
 
@@ -580,7 +404,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="587"
+            line="668"
             column="13"/>
     </issue>
 
@@ -591,7 +415,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="628"
+            line="709"
             column="44"/>
     </issue>
 
@@ -602,7 +426,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="672"
+            line="753"
             column="19"/>
     </issue>
 
@@ -613,7 +437,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="673"
+            line="754"
             column="13"/>
     </issue>
 
@@ -624,7 +448,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="683"
+            line="764"
             column="48"/>
     </issue>
 
@@ -635,106 +459,18 @@
         errorLine2="                                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="699"
+            line="780"
             column="58"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static LibraryParams convertToLibraryParams(Context context, Bundle legacyBundle) {"
-        errorLine2="                  ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="737"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static LibraryParams convertToLibraryParams(Context context, Bundle legacyBundle) {"
-        errorLine2="                                                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="737"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static LibraryParams convertToLibraryParams(Context context, Bundle legacyBundle) {"
-        errorLine2="                                                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="737"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Bundle convertToRootHints(LibraryParams params) {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="760"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Bundle convertToRootHints(LibraryParams params) {"
-        errorLine2="                                            ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="760"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static &lt;T> List&lt;T> removeNullElements(@Nullable List&lt;T> list) {"
-        errorLine2="                      ~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="778"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            PlaybackStateCompat state) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="805"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static List&lt;CommandButton> convertToCustomLayout(PlaybackStateCompat state) {"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="835"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public ComponentName getComponentName() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/SessionToken.java"
-            line="217"
+            line="210"
             column="12"/>
     </issue>
 
@@ -745,7 +481,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/SessionToken.java"
-            line="252"
+            line="250"
             column="12"/>
     </issue>
 
@@ -756,7 +492,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/SessionToken.java"
-            line="442"
+            line="426"
             column="36"/>
     </issue>
 
@@ -767,7 +503,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/SessionToken.java"
-            line="442"
+            line="426"
             column="68"/>
     </issue>
 
diff --git a/media2/session/version-compat-tests/common/lint-baseline.xml b/media2/session/version-compat-tests/common/lint-baseline.xml
index e8a5b83..ac60efd 100644
--- a/media2/session/version-compat-tests/common/lint-baseline.xml
+++ b/media2/session/version-compat-tests/common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/media2/widget/lint-baseline.xml b/media2/widget/lint-baseline.xml
index 17f4b56..f1345bd 100644
--- a/media2/widget/lint-baseline.xml
+++ b/media2/widget/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -8,7 +8,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/widget/MediaControlView.java"
-            line="356"
+            line="408"
             column="12"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/widget/MediaControlView.java"
-            line="362"
+            line="414"
             column="33"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                    ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/widget/MediaControlView.java"
-            line="379"
+            line="431"
             column="37"/>
     </issue>
 
@@ -41,7 +41,8 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/widget/VideoView.java"
-            line="518"
+            line="525"
             column="12"/>
     </issue>
+
 </issues>
diff --git a/mediarouter/lint-baseline.xml b/mediarouter/lint-baseline.xml
index 21d586a..ee1a21a 100644
--- a/mediarouter/lint-baseline.xml
+++ b/mediarouter/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -140,7 +140,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java"
-            line="148"
+            line="149"
             column="37"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java"
-            line="281"
+            line="282"
             column="12"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java"
-            line="287"
+            line="288"
             column="12"/>
     </issue>
 
@@ -283,7 +283,7 @@
         errorLine2="                                   ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java"
-            line="92"
+            line="93"
             column="36"/>
     </issue>
 
@@ -294,7 +294,7 @@
         errorLine2="                                   ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java"
-            line="96"
+            line="97"
             column="36"/>
     </issue>
 
@@ -305,7 +305,7 @@
         errorLine2="                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java"
-            line="172"
+            line="173"
             column="26"/>
     </issue>
 
@@ -316,7 +316,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java"
-            line="182"
+            line="183"
             column="29"/>
     </issue>
 
@@ -437,7 +437,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="200"
+            line="199"
             column="39"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="204"
+            line="203"
             column="39"/>
     </issue>
 
@@ -459,7 +459,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="230"
+            line="229"
             column="12"/>
     </issue>
 
@@ -470,7 +470,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="241"
+            line="240"
             column="12"/>
     </issue>
 
@@ -481,7 +481,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="241"
+            line="240"
             column="42"/>
     </issue>
 
@@ -492,7 +492,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="250"
+            line="249"
             column="12"/>
     </issue>
 
@@ -503,7 +503,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="317"
+            line="309"
             column="12"/>
     </issue>
 
@@ -514,7 +514,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="322"
+            line="314"
             column="29"/>
     </issue>
 
@@ -525,7 +525,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="489"
+            line="481"
             column="43"/>
     </issue>
 
@@ -536,7 +536,7 @@
         errorLine2="                                        ~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java"
-            line="499"
+            line="491"
             column="41"/>
     </issue>
 
@@ -1317,7 +1317,7 @@
         errorLine2="                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicChooserDialog.java"
-            line="97"
+            line="98"
             column="43"/>
     </issue>
 
@@ -1328,7 +1328,7 @@
         errorLine2="                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicChooserDialog.java"
-            line="101"
+            line="102"
             column="43"/>
     </issue>
 
@@ -1339,7 +1339,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicChooserDialog.java"
-            line="178"
+            line="179"
             column="29"/>
     </issue>
 
@@ -1350,7 +1350,7 @@
         errorLine2="                                             ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"
-            line="215"
+            line="214"
             column="46"/>
     </issue>
 
@@ -1361,7 +1361,7 @@
         errorLine2="                                             ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"
-            line="219"
+            line="218"
             column="46"/>
     </issue>
 
@@ -1372,7 +1372,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"
-            line="269"
+            line="261"
             column="12"/>
     </issue>
 
@@ -1383,7 +1383,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"
-            line="338"
+            line="330"
             column="29"/>
     </issue>
 
@@ -1493,7 +1493,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="754"
+            line="755"
             column="32"/>
     </issue>
 
@@ -1504,7 +1504,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="761"
+            line="762"
             column="32"/>
     </issue>
 
@@ -1515,7 +1515,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="772"
+            line="773"
             column="24"/>
     </issue>
 
@@ -1526,7 +1526,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="780"
+            line="781"
             column="24"/>
     </issue>
 
@@ -1537,7 +1537,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="789"
+            line="790"
             column="24"/>
     </issue>
 
@@ -1548,7 +1548,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="797"
+            line="798"
             column="24"/>
     </issue>
 
@@ -1559,7 +1559,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="805"
+            line="806"
             column="24"/>
     </issue>
 
@@ -1680,7 +1680,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="156"
+            line="157"
             column="21"/>
     </issue>
 
@@ -1691,7 +1691,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="166"
+            line="167"
             column="12"/>
     </issue>
 
@@ -1702,7 +1702,7 @@
         errorLine2="           ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="171"
+            line="172"
             column="12"/>
     </issue>
 
@@ -1713,7 +1713,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="171"
+            line="172"
             column="27"/>
     </issue>
 
@@ -1724,7 +1724,7 @@
         errorLine2="                            ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="197"
+            line="198"
             column="29"/>
     </issue>
 
diff --git a/navigation/navigation-dynamic-features-activity/build.gradle b/navigation/navigation-dynamic-features-activity/build.gradle
index f64abc8..50bd49b 100644
--- a/navigation/navigation-dynamic-features-activity/build.gradle
+++ b/navigation/navigation-dynamic-features-activity/build.gradle
@@ -26,13 +26,6 @@
     id("kotlin-android")
 }
 
-android {
-
-    lintOptions {
-        fatal("UnknownNullness")
-    }
-}
-
 dependencies {
     api("androidx.core:core:1.1.0")
     implementation("androidx.collection:collection:1.0.0")
diff --git a/navigation/navigation-dynamic-features-core/build.gradle b/navigation/navigation-dynamic-features-core/build.gradle
index 2d75fee..22bc032 100644
--- a/navigation/navigation-dynamic-features-core/build.gradle
+++ b/navigation/navigation-dynamic-features-core/build.gradle
@@ -26,12 +26,6 @@
     id("kotlin-android")
 }
 
-android {
-    lintOptions {
-        fatal("UnknownNullness")
-    }
-}
-
 dependencies {
     api("androidx.core:core:1.1.0")
     implementation("androidx.collection:collection:1.1.0")
diff --git a/navigation/navigation-dynamic-features-fragment/build.gradle b/navigation/navigation-dynamic-features-fragment/build.gradle
index f240fbf..f377561 100644
--- a/navigation/navigation-dynamic-features-fragment/build.gradle
+++ b/navigation/navigation-dynamic-features-fragment/build.gradle
@@ -26,12 +26,6 @@
     id("kotlin-android")
 }
 
-android {
-    lintOptions {
-        fatal("UnknownNullness")
-    }
-}
-
 dependencies {
     api("androidx.core:core:1.1.0")
     implementation("androidx.collection:collection:1.0.0")
diff --git a/paging/runtime/lint-baseline.xml b/paging/runtime/lint-baseline.xml
index 130f1a6..a6eda51 100644
--- a/paging/runtime/lint-baseline.xml
+++ b/paging/runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="RestrictedApi"
diff --git a/paging/rxjava2/lint-baseline.xml b/paging/rxjava2/lint-baseline.xml
index 1214217..5dc0fd6 100644
--- a/paging/rxjava2/lint-baseline.xml
+++ b/paging/rxjava2/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="RestrictedApi"
diff --git a/percentlayout/percentlayout/lint-baseline.xml b/percentlayout/percentlayout/lint-baseline.xml
index aad92e4..4a48c895 100644
--- a/percentlayout/percentlayout/lint-baseline.xml
+++ b/percentlayout/percentlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -8,7 +8,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="136"
+            line="137"
             column="31"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="140"
+            line="141"
             column="31"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="140"
+            line="141"
             column="48"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="144"
+            line="145"
             column="31"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="144"
+            line="145"
             column="48"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="              ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="149"
+            line="150"
             column="15"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="154"
+            line="155"
             column="12"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="154"
+            line="155"
             column="46"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="181"
+            line="182"
             column="29"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="181"
+            line="182"
             column="40"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="194"
+            line="195"
             column="29"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="198"
+            line="199"
             column="29"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="202"
+            line="203"
             column="29"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="208"
+            line="209"
             column="29"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="215"
+            line="216"
             column="16"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java"
-            line="224"
+            line="225"
             column="42"/>
     </issue>
 
@@ -316,7 +316,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="133"
+            line="134"
             column="34"/>
     </issue>
 
@@ -327,7 +327,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="137"
+            line="138"
             column="34"/>
     </issue>
 
@@ -338,7 +338,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="137"
+            line="138"
             column="51"/>
     </issue>
 
@@ -349,7 +349,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="141"
+            line="142"
             column="34"/>
     </issue>
 
@@ -360,7 +360,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="141"
+            line="142"
             column="51"/>
     </issue>
 
@@ -371,7 +371,7 @@
         errorLine2="              ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="146"
+            line="147"
             column="15"/>
     </issue>
 
@@ -382,7 +382,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="151"
+            line="152"
             column="12"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="151"
+            line="152"
             column="46"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="178"
+            line="179"
             column="29"/>
     </issue>
 
@@ -415,7 +415,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="178"
+            line="179"
             column="40"/>
     </issue>
 
@@ -426,7 +426,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="187"
+            line="188"
             column="29"/>
     </issue>
 
@@ -437,7 +437,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="191"
+            line="192"
             column="29"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="196"
+            line="197"
             column="16"/>
     </issue>
 
@@ -459,7 +459,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/percentlayout/widget/PercentRelativeLayout.java"
-            line="205"
+            line="206"
             column="42"/>
     </issue>
 
diff --git a/preference/preference/lint-baseline.xml b/preference/preference/lint-baseline.xml
index 0dd9035..a07658e 100644
--- a/preference/preference/lint-baseline.xml
+++ b/preference/preference/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -4540,7 +4540,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="89"
+            line="88"
             column="26"/>
     </issue>
 
@@ -4551,7 +4551,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="89"
+            line="88"
             column="26"/>
     </issue>
 
@@ -4562,7 +4562,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="150"
+            line="149"
             column="34"/>
     </issue>
 
@@ -4573,7 +4573,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="150"
+            line="149"
             column="34"/>
     </issue>
 
@@ -4584,7 +4584,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="188"
+            line="187"
             column="12"/>
     </issue>
 
@@ -4595,7 +4595,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="188"
+            line="187"
             column="12"/>
     </issue>
 
@@ -4606,7 +4606,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="207"
+            line="206"
             column="43"/>
     </issue>
 
@@ -4617,7 +4617,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="207"
+            line="206"
             column="43"/>
     </issue>
 
@@ -4628,7 +4628,7 @@
         errorLine2="              ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="243"
+            line="242"
             column="15"/>
     </issue>
 
@@ -4639,7 +4639,7 @@
         errorLine2="              ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="243"
+            line="242"
             column="15"/>
     </issue>
 
@@ -4650,7 +4650,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="243"
+            line="242"
             column="39"/>
     </issue>
 
@@ -4661,7 +4661,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="243"
+            line="242"
             column="39"/>
     </issue>
 
@@ -4672,7 +4672,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="263"
+            line="262"
             column="37"/>
     </issue>
 
@@ -4683,7 +4683,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="263"
+            line="262"
             column="37"/>
     </issue>
 
@@ -4694,7 +4694,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="289"
+            line="288"
             column="25"/>
     </issue>
 
@@ -4705,7 +4705,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="289"
+            line="288"
             column="25"/>
     </issue>
 
@@ -4716,7 +4716,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="294"
+            line="293"
             column="27"/>
     </issue>
 
@@ -4727,7 +4727,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="294"
+            line="293"
             column="27"/>
     </issue>
 
@@ -4914,7 +4914,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="147"
+            line="145"
             column="26"/>
     </issue>
 
@@ -4925,7 +4925,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="147"
+            line="145"
             column="26"/>
     </issue>
 
@@ -4936,7 +4936,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="183"
+            line="181"
             column="46"/>
     </issue>
 
@@ -4947,7 +4947,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="183"
+            line="181"
             column="46"/>
     </issue>
 
@@ -4958,7 +4958,7 @@
         errorLine2="                                                                        ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="183"
+            line="181"
             column="73"/>
     </issue>
 
@@ -4969,7 +4969,7 @@
         errorLine2="                                                                        ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="183"
+            line="181"
             column="73"/>
     </issue>
 
@@ -4980,7 +4980,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="186"
+            line="184"
             column="12"/>
     </issue>
 
@@ -4991,7 +4991,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="186"
+            line="184"
             column="12"/>
     </issue>
 
@@ -5002,7 +5002,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="186"
+            line="184"
             column="30"/>
     </issue>
 
@@ -5013,7 +5013,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="186"
+            line="184"
             column="30"/>
     </issue>
 
@@ -5024,7 +5024,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="186"
+            line="184"
             column="55"/>
     </issue>
 
@@ -5035,7 +5035,7 @@
         errorLine2="                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="186"
+            line="184"
             column="55"/>
     </issue>
 
@@ -5046,7 +5046,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="187"
+            line="185"
             column="13"/>
     </issue>
 
@@ -5057,7 +5057,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="187"
+            line="185"
             column="13"/>
     </issue>
 
@@ -5068,7 +5068,7 @@
         errorLine2="                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="252"
+            line="250"
             column="28"/>
     </issue>
 
@@ -5079,7 +5079,7 @@
         errorLine2="                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="252"
+            line="250"
             column="28"/>
     </issue>
 
@@ -5090,7 +5090,7 @@
         errorLine2="                              ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="271"
+            line="269"
             column="31"/>
     </issue>
 
@@ -5101,7 +5101,7 @@
         errorLine2="                              ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="271"
+            line="269"
             column="31"/>
     </issue>
 
@@ -5112,7 +5112,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="271"
+            line="269"
             column="42"/>
     </issue>
 
@@ -5123,7 +5123,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="271"
+            line="269"
             column="42"/>
     </issue>
 
@@ -5134,7 +5134,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="321"
+            line="319"
             column="37"/>
     </issue>
 
@@ -5145,7 +5145,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="321"
+            line="319"
             column="37"/>
     </issue>
 
@@ -5156,7 +5156,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="340"
+            line="338"
             column="12"/>
     </issue>
 
@@ -5167,7 +5167,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="340"
+            line="338"
             column="12"/>
     </issue>
 
@@ -5178,7 +5178,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="352"
+            line="350"
             column="37"/>
     </issue>
 
@@ -5189,7 +5189,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="352"
+            line="350"
             column="37"/>
     </issue>
 
@@ -5200,7 +5200,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="370"
+            line="368"
             column="12"/>
     </issue>
 
@@ -5211,7 +5211,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="370"
+            line="368"
             column="12"/>
     </issue>
 
@@ -5222,7 +5222,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="428"
+            line="426"
             column="42"/>
     </issue>
 
@@ -5233,7 +5233,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="428"
+            line="426"
             column="42"/>
     </issue>
 
@@ -5244,7 +5244,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="457"
+            line="455"
             column="36"/>
     </issue>
 
@@ -5255,7 +5255,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="457"
+            line="455"
             column="36"/>
     </issue>
 
@@ -5266,7 +5266,7 @@
         errorLine2="                                  ~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="481"
+            line="479"
             column="35"/>
     </issue>
 
@@ -5277,7 +5277,7 @@
         errorLine2="                                  ~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="481"
+            line="479"
             column="35"/>
     </issue>
 
@@ -5288,7 +5288,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="481"
+            line="479"
             column="52"/>
     </issue>
 
@@ -5299,7 +5299,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="481"
+            line="479"
             column="52"/>
     </issue>
 
@@ -5310,7 +5310,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="528"
+            line="526"
             column="18"/>
     </issue>
 
@@ -5321,7 +5321,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="528"
+            line="526"
             column="18"/>
     </issue>
 
@@ -5332,7 +5332,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="548"
+            line="546"
             column="12"/>
     </issue>
 
@@ -5343,7 +5343,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="548"
+            line="546"
             column="12"/>
     </issue>
 
@@ -5354,7 +5354,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="548"
+            line="546"
             column="46"/>
     </issue>
 
@@ -5365,7 +5365,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="548"
+            line="546"
             column="46"/>
     </issue>
 
@@ -5376,7 +5376,7 @@
         errorLine2="                                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="548"
+            line="546"
             column="71"/>
     </issue>
 
@@ -5387,7 +5387,7 @@
         errorLine2="                                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="548"
+            line="546"
             column="71"/>
     </issue>
 
@@ -5398,7 +5398,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="549"
+            line="547"
             column="13"/>
     </issue>
 
@@ -5409,7 +5409,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="549"
+            line="547"
             column="13"/>
     </issue>
 
@@ -5420,7 +5420,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="578"
+            line="576"
             column="12"/>
     </issue>
 
@@ -5431,7 +5431,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="578"
+            line="576"
             column="12"/>
     </issue>
 
@@ -5442,7 +5442,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="591"
+            line="589"
             column="15"/>
     </issue>
 
@@ -5453,7 +5453,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="591"
+            line="589"
             column="15"/>
     </issue>
 
@@ -5464,7 +5464,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="591"
+            line="589"
             column="52"/>
     </issue>
 
@@ -5475,7 +5475,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="591"
+            line="589"
             column="52"/>
     </issue>
 
@@ -5486,7 +5486,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="606"
+            line="604"
             column="43"/>
     </issue>
 
@@ -5497,29 +5497,29 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="606"
+            line="604"
             column="43"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Fragment getCallbackFragment() {"
-        errorLine2="           ~~~~~~~~">
+        errorLine1="    public android.app.Fragment getCallbackFragment() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="649"
+            line="647"
             column="12"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Fragment getCallbackFragment() {"
-        errorLine2="           ~~~~~~~~">
+        errorLine1="    public android.app.Fragment getCallbackFragment() {"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="649"
+            line="647"
             column="12"/>
     </issue>
 
@@ -5530,7 +5530,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="657"
+            line="655"
             column="42"/>
     </issue>
 
@@ -5541,7 +5541,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="657"
+            line="655"
             column="42"/>
     </issue>
 
@@ -5552,7 +5552,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="665"
+            line="663"
             column="42"/>
     </issue>
 
@@ -5563,7 +5563,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="665"
+            line="663"
             column="42"/>
     </issue>
 
@@ -5574,7 +5574,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="721"
+            line="719"
             column="43"/>
     </issue>
 
@@ -5585,7 +5585,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="721"
+            line="719"
             column="43"/>
     </issue>
 
@@ -5596,7 +5596,7 @@
         errorLine2="                                                                     ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="721"
+            line="719"
             column="70"/>
     </issue>
 
@@ -5607,7 +5607,7 @@
         errorLine2="                                                                     ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="721"
+            line="719"
             column="70"/>
     </issue>
 
@@ -5618,7 +5618,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="737"
+            line="735"
             column="41"/>
     </issue>
 
@@ -5629,7 +5629,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="737"
+            line="735"
             column="41"/>
     </issue>
 
@@ -5640,7 +5640,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="737"
+            line="735"
             column="68"/>
     </issue>
 
@@ -5651,7 +5651,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="737"
+            line="735"
             column="68"/>
     </issue>
 
@@ -5662,7 +5662,7 @@
         errorLine2="                                                                              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="750"
+            line="748"
             column="79"/>
     </issue>
 
@@ -5673,7 +5673,7 @@
         errorLine2="                                                                              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragment.java"
-            line="750"
+            line="748"
             column="79"/>
     </issue>
 
@@ -5904,7 +5904,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="529"
+            line="530"
             column="12"/>
     </issue>
 
@@ -5915,7 +5915,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="529"
+            line="530"
             column="12"/>
     </issue>
 
@@ -5926,7 +5926,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="529"
+            line="530"
             column="46"/>
     </issue>
 
@@ -5937,7 +5937,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="529"
+            line="530"
             column="46"/>
     </issue>
 
@@ -5948,7 +5948,7 @@
         errorLine2="                                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="529"
+            line="530"
             column="71"/>
     </issue>
 
@@ -5959,7 +5959,7 @@
         errorLine2="                                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="529"
+            line="530"
             column="71"/>
     </issue>
 
@@ -5970,7 +5970,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="530"
+            line="531"
             column="13"/>
     </issue>
 
@@ -5981,7 +5981,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="530"
+            line="531"
             column="13"/>
     </issue>
 
@@ -5992,7 +5992,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="556"
+            line="557"
             column="12"/>
     </issue>
 
@@ -6003,7 +6003,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="556"
+            line="557"
             column="12"/>
     </issue>
 
@@ -6014,7 +6014,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="566"
+            line="567"
             column="15"/>
     </issue>
 
@@ -6025,7 +6025,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="566"
+            line="567"
             column="15"/>
     </issue>
 
@@ -6036,7 +6036,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="566"
+            line="567"
             column="52"/>
     </issue>
 
@@ -6047,7 +6047,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="566"
+            line="567"
             column="52"/>
     </issue>
 
@@ -6058,7 +6058,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="578"
+            line="579"
             column="43"/>
     </issue>
 
@@ -6069,7 +6069,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="578"
+            line="579"
             column="43"/>
     </issue>
 
@@ -6080,7 +6080,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="624"
+            line="625"
             column="12"/>
     </issue>
 
@@ -6091,7 +6091,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="624"
+            line="625"
             column="12"/>
     </issue>
 
@@ -6102,7 +6102,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="628"
+            line="629"
             column="42"/>
     </issue>
 
@@ -6113,7 +6113,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="628"
+            line="629"
             column="42"/>
     </issue>
 
@@ -6124,7 +6124,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="632"
+            line="633"
             column="42"/>
     </issue>
 
@@ -6135,7 +6135,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="632"
+            line="633"
             column="42"/>
     </issue>
 
@@ -6146,7 +6146,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="689"
+            line="690"
             column="43"/>
     </issue>
 
@@ -6157,7 +6157,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="689"
+            line="690"
             column="43"/>
     </issue>
 
@@ -6168,7 +6168,7 @@
         errorLine2="                                                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="689"
+            line="690"
             column="76"/>
     </issue>
 
@@ -6179,7 +6179,7 @@
         errorLine2="                                                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="689"
+            line="690"
             column="76"/>
     </issue>
 
@@ -6190,7 +6190,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="705"
+            line="706"
             column="41"/>
     </issue>
 
@@ -6201,7 +6201,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="705"
+            line="706"
             column="41"/>
     </issue>
 
@@ -6212,7 +6212,7 @@
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="705"
+            line="706"
             column="74"/>
     </issue>
 
@@ -6223,7 +6223,7 @@
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="705"
+            line="706"
             column="74"/>
     </issue>
 
@@ -6234,7 +6234,7 @@
         errorLine2="                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="719"
+            line="720"
             column="17"/>
     </issue>
 
@@ -6245,7 +6245,7 @@
         errorLine2="                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="719"
+            line="720"
             column="17"/>
     </issue>
 
diff --git a/recommendation/lint-baseline.xml b/recommendation/lint-baseline.xml
index 78f6066..90344c5 100644
--- a/recommendation/lint-baseline.xml
+++ b/recommendation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/recyclerview/recyclerview-selection/lint-baseline.xml b/recyclerview/recyclerview-selection/lint-baseline.xml
index a42b82a..fcaca2f 100644
--- a/recyclerview/recyclerview-selection/lint-baseline.xml
+++ b/recyclerview/recyclerview-selection/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
@@ -8,7 +8,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java"
-            line="138"
+            line="139"
             column="64"/>
     </issue>
 
@@ -37,11 +37,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Selection getSelection() {"
-        errorLine2="           ~~~~~~~~~">
+        errorLine1="    public Selection&lt;K> getSelection() {"
+        errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java"
-            line="115"
+            line="116"
             column="12"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java"
-            line="356"
+            line="357"
             column="15"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/Selection.java"
-            line="95"
+            line="93"
             column="12"/>
     </issue>
 
@@ -92,17 +92,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public abstract void addObserver(SelectionObserver observer);"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="113"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public abstract Selection&lt;K> getSelection();"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
@@ -129,7 +118,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="548"
+            line="549"
             column="16"/>
     </issue>
 
@@ -140,7 +129,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="563"
+            line="564"
             column="16"/>
     </issue>
 
@@ -151,7 +140,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="577"
+            line="578"
             column="16"/>
     </issue>
 
@@ -162,7 +151,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="589"
+            line="590"
             column="16"/>
     </issue>
 
@@ -173,7 +162,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="604"
+            line="605"
             column="16"/>
     </issue>
 
@@ -184,7 +173,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="619"
+            line="620"
             column="16"/>
     </issue>
 
@@ -195,7 +184,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="635"
+            line="636"
             column="16"/>
     </issue>
 
@@ -206,7 +195,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="635"
+            line="636"
             column="48"/>
     </issue>
 
@@ -217,7 +206,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="646"
+            line="647"
             column="16"/>
     </issue>
 
@@ -228,7 +217,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="656"
+            line="657"
             column="16"/>
     </issue>
 
@@ -239,7 +228,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="672"
+            line="673"
             column="16"/>
     </issue>
 
@@ -250,7 +239,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="672"
+            line="673"
             column="48"/>
     </issue>
 
@@ -261,7 +250,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="682"
+            line="683"
             column="16"/>
     </issue>
 
diff --git a/recyclerview/recyclerview/lint-baseline.xml b/recyclerview/recyclerview/lint-baseline.xml
index e5bc9bb..2bc4f0a 100644
--- a/recyclerview/recyclerview/lint-baseline.xml
+++ b/recyclerview/recyclerview/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -30,7 +30,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7165"
+            line="7174"
             column="30"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7165"
+            line="7174"
             column="30"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11404"
+            line="11413"
             column="27"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11404"
+            line="11413"
             column="27"/>
     </issue>
 
@@ -3660,7 +3660,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2287"
+            line="2289"
             column="37"/>
     </issue>
 
@@ -3671,7 +3671,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2287"
+            line="2289"
             column="37"/>
     </issue>
 
@@ -3682,7 +3682,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2745"
+            line="2747"
             column="12"/>
     </issue>
 
@@ -3693,7 +3693,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2745"
+            line="2747"
             column="12"/>
     </issue>
 
@@ -3704,7 +3704,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2745"
+            line="2747"
             column="29"/>
     </issue>
 
@@ -3715,7 +3715,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2745"
+            line="2747"
             column="29"/>
     </issue>
 
@@ -3726,7 +3726,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2890"
+            line="2892"
             column="35"/>
     </issue>
 
@@ -3737,7 +3737,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2890"
+            line="2892"
             column="35"/>
     </issue>
 
@@ -3748,7 +3748,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2890"
+            line="2892"
             column="47"/>
     </issue>
 
@@ -3759,7 +3759,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2890"
+            line="2892"
             column="47"/>
     </issue>
 
@@ -3770,7 +3770,7 @@
         errorLine2="                                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2935"
+            line="2937"
             column="50"/>
     </issue>
 
@@ -3781,7 +3781,7 @@
         errorLine2="                                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2935"
+            line="2937"
             column="50"/>
     </issue>
 
@@ -3792,7 +3792,7 @@
         errorLine2="                                                             ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2935"
+            line="2937"
             column="62"/>
     </issue>
 
@@ -3803,7 +3803,7 @@
         errorLine2="                                                             ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2935"
+            line="2937"
             column="62"/>
     </issue>
 
@@ -3814,7 +3814,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2940"
+            line="2942"
             column="31"/>
     </issue>
 
@@ -3825,7 +3825,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2940"
+            line="2942"
             column="31"/>
     </issue>
 
@@ -3836,7 +3836,7 @@
         errorLine2="                                                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2947"
+            line="2949"
             column="66"/>
     </issue>
 
@@ -3847,7 +3847,7 @@
         errorLine2="                                                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2947"
+            line="2949"
             column="66"/>
     </issue>
 
@@ -3858,7 +3858,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3158"
+            line="3160"
             column="42"/>
     </issue>
 
@@ -3869,7 +3869,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3158"
+            line="3160"
             column="42"/>
     </issue>
 
@@ -3880,7 +3880,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3277"
+            line="3279"
             column="33"/>
     </issue>
 
@@ -3891,7 +3891,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3277"
+            line="3279"
             column="33"/>
     </issue>
 
@@ -3902,7 +3902,7 @@
         errorLine2="                                        ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3457"
+            line="3459"
             column="41"/>
     </issue>
 
@@ -3913,7 +3913,7 @@
         errorLine2="                                        ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3457"
+            line="3459"
             column="41"/>
     </issue>
 
@@ -3924,7 +3924,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3730"
+            line="3732"
             column="49"/>
     </issue>
 
@@ -3935,7 +3935,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3730"
+            line="3732"
             column="49"/>
     </issue>
 
@@ -3946,7 +3946,7 @@
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3738"
+            line="3740"
             column="55"/>
     </issue>
 
@@ -3957,7 +3957,7 @@
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3738"
+            line="3740"
             column="55"/>
     </issue>
 
@@ -3968,7 +3968,7 @@
         errorLine2="                                      ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4331"
+            line="4333"
             column="39"/>
     </issue>
 
@@ -3979,7 +3979,7 @@
         errorLine2="                                      ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4331"
+            line="4333"
             column="39"/>
     </issue>
 
@@ -3990,7 +3990,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4426"
+            line="4428"
             column="22"/>
     </issue>
 
@@ -4001,7 +4001,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4426"
+            line="4428"
             column="22"/>
     </issue>
 
@@ -4012,7 +4012,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4487"
+            line="4489"
             column="24"/>
     </issue>
 
@@ -4023,7 +4023,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4487"
+            line="4489"
             column="24"/>
     </issue>
 
@@ -4034,7 +4034,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4497"
+            line="4499"
             column="41"/>
     </issue>
 
@@ -4045,7 +4045,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4497"
+            line="4499"
             column="41"/>
     </issue>
 
@@ -4056,7 +4056,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4502"
+            line="4504"
             column="15"/>
     </issue>
 
@@ -4067,7 +4067,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4502"
+            line="4504"
             column="15"/>
     </issue>
 
@@ -4078,7 +4078,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4510"
+            line="4512"
             column="12"/>
     </issue>
 
@@ -4089,7 +4089,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4510"
+            line="4512"
             column="12"/>
     </issue>
 
@@ -4100,7 +4100,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4510"
+            line="4512"
             column="56"/>
     </issue>
 
@@ -4111,7 +4111,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4510"
+            line="4512"
             column="56"/>
     </issue>
 
@@ -4122,7 +4122,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4518"
+            line="4520"
             column="15"/>
     </issue>
 
@@ -4133,7 +4133,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4518"
+            line="4520"
             column="15"/>
     </issue>
 
@@ -4144,7 +4144,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4518"
+            line="4520"
             column="59"/>
     </issue>
 
@@ -4155,7 +4155,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4518"
+            line="4520"
             column="59"/>
     </issue>
 
@@ -4166,7 +4166,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4766"
+            line="4768"
             column="12"/>
     </issue>
 
@@ -4177,7 +4177,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4766"
+            line="4768"
             column="12"/>
     </issue>
 
@@ -4188,7 +4188,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4983"
+            line="4985"
             column="12"/>
     </issue>
 
@@ -4199,7 +4199,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4983"
+            line="4985"
             column="12"/>
     </issue>
 
@@ -4210,7 +4210,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5027"
+            line="5029"
             column="30"/>
     </issue>
 
@@ -4221,7 +4221,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5027"
+            line="5029"
             column="30"/>
     </issue>
 
@@ -4232,7 +4232,7 @@
         errorLine2="                                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5027"
+            line="5029"
             column="45"/>
     </issue>
 
@@ -4243,7 +4243,7 @@
         errorLine2="                                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5027"
+            line="5029"
             column="45"/>
     </issue>
 
@@ -4254,7 +4254,7 @@
         errorLine2="                                    ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5737"
+            line="5739"
             column="37"/>
     </issue>
 
@@ -4265,7 +4265,7 @@
         errorLine2="                                    ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5737"
+            line="5739"
             column="37"/>
     </issue>
 
@@ -4276,7 +4276,7 @@
         errorLine2="                                         ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7826"
+            line="7835"
             column="42"/>
     </issue>
 
@@ -4287,7 +4287,7 @@
         errorLine2="                                         ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7826"
+            line="7835"
             column="42"/>
     </issue>
 
@@ -4298,7 +4298,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7850"
+            line="7859"
             column="44"/>
     </issue>
 
@@ -4309,7 +4309,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7850"
+            line="7859"
             column="44"/>
     </issue>
 
@@ -4320,7 +4320,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7887"
+            line="7896"
             column="47"/>
     </issue>
 
@@ -4331,7 +4331,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7887"
+            line="7896"
             column="47"/>
     </issue>
 
@@ -4342,7 +4342,7 @@
         errorLine2="                                                                     ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8072"
+            line="8081"
             column="70"/>
     </issue>
 
@@ -4353,7 +4353,7 @@
         errorLine2="                                                                     ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8072"
+            line="8081"
             column="70"/>
     </issue>
 
@@ -4364,7 +4364,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8073"
+            line="8082"
             column="17"/>
     </issue>
 
@@ -4375,7 +4375,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8073"
+            line="8082"
             column="17"/>
     </issue>
 
@@ -4386,7 +4386,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8101"
+            line="8110"
             column="17"/>
     </issue>
 
@@ -4397,7 +4397,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8101"
+            line="8110"
             column="17"/>
     </issue>
 
@@ -4408,7 +4408,7 @@
         errorLine2="                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8134"
+            line="8143"
             column="37"/>
     </issue>
 
@@ -4419,7 +4419,7 @@
         errorLine2="                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8134"
+            line="8143"
             column="37"/>
     </issue>
 
@@ -4430,7 +4430,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8154"
+            line="8163"
             column="40"/>
     </issue>
 
@@ -4441,7 +4441,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8154"
+            line="8163"
             column="40"/>
     </issue>
 
@@ -4452,7 +4452,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8175"
+            line="8184"
             column="40"/>
     </issue>
 
@@ -4463,7 +4463,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8175"
+            line="8184"
             column="40"/>
     </issue>
 
@@ -4474,7 +4474,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8183"
+            line="8192"
             column="42"/>
     </issue>
 
@@ -4485,7 +4485,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8183"
+            line="8192"
             column="42"/>
     </issue>
 
@@ -4496,7 +4496,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8211"
+            line="8220"
             column="42"/>
     </issue>
 
@@ -4507,7 +4507,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8211"
+            line="8220"
             column="42"/>
     </issue>
 
@@ -4518,7 +4518,7 @@
         errorLine2="                                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8211"
+            line="8220"
             column="61"/>
     </issue>
 
@@ -4529,7 +4529,7 @@
         errorLine2="                                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8211"
+            line="8220"
             column="61"/>
     </issue>
 
@@ -4540,7 +4540,7 @@
         errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8275"
+            line="8284"
             column="38"/>
     </issue>
 
@@ -4551,7 +4551,7 @@
         errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8275"
+            line="8284"
             column="38"/>
     </issue>
 
@@ -4562,7 +4562,7 @@
         errorLine2="                                                        ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8275"
+            line="8284"
             column="57"/>
     </issue>
 
@@ -4573,7 +4573,7 @@
         errorLine2="                                                        ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8275"
+            line="8284"
             column="57"/>
     </issue>
 
@@ -4584,7 +4584,7 @@
         errorLine2="                                      ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8290"
+            line="8299"
             column="39"/>
     </issue>
 
@@ -4595,7 +4595,7 @@
         errorLine2="                                      ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8290"
+            line="8299"
             column="39"/>
     </issue>
 
@@ -4606,7 +4606,7 @@
         errorLine2="                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8308"
+            line="8317"
             column="25"/>
     </issue>
 
@@ -4617,7 +4617,7 @@
         errorLine2="                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8308"
+            line="8317"
             column="25"/>
     </issue>
 
@@ -4628,7 +4628,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8320"
+            line="8329"
             column="42"/>
     </issue>
 
@@ -4639,7 +4639,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8320"
+            line="8329"
             column="42"/>
     </issue>
 
@@ -4650,7 +4650,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8337"
+            line="8346"
             column="16"/>
     </issue>
 
@@ -4661,7 +4661,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8337"
+            line="8346"
             column="16"/>
     </issue>
 
@@ -4672,7 +4672,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8337"
+            line="8346"
             column="50"/>
     </issue>
 
@@ -4683,7 +4683,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8337"
+            line="8346"
             column="50"/>
     </issue>
 
@@ -4694,7 +4694,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8361"
+            line="8370"
             column="16"/>
     </issue>
 
@@ -4705,7 +4705,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8361"
+            line="8370"
             column="16"/>
     </issue>
 
@@ -4716,7 +4716,7 @@
         errorLine2="                                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8361"
+            line="8370"
             column="50"/>
     </issue>
 
@@ -4727,7 +4727,7 @@
         errorLine2="                                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8361"
+            line="8370"
             column="50"/>
     </issue>
 
@@ -4738,7 +4738,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8361"
+            line="8370"
             column="61"/>
     </issue>
 
@@ -4749,7 +4749,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8361"
+            line="8370"
             column="61"/>
     </issue>
 
@@ -4760,7 +4760,7 @@
         errorLine2="                                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8378"
+            line="8387"
             column="49"/>
     </issue>
 
@@ -4771,7 +4771,7 @@
         errorLine2="                                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8378"
+            line="8387"
             column="49"/>
     </issue>
 
@@ -4782,7 +4782,7 @@
         errorLine2="                                                                   ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8378"
+            line="8387"
             column="68"/>
     </issue>
 
@@ -4793,7 +4793,7 @@
         errorLine2="                                                                   ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8378"
+            line="8387"
             column="68"/>
     </issue>
 
@@ -4804,7 +4804,7 @@
         errorLine2="                                              ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8395"
+            line="8404"
             column="47"/>
     </issue>
 
@@ -4815,7 +4815,7 @@
         errorLine2="                                              ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8395"
+            line="8404"
             column="47"/>
     </issue>
 
@@ -4826,7 +4826,7 @@
         errorLine2="                                                                 ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8395"
+            line="8404"
             column="66"/>
     </issue>
 
@@ -4837,7 +4837,7 @@
         errorLine2="                                                                 ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8395"
+            line="8404"
             column="66"/>
     </issue>
 
@@ -4848,7 +4848,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8440"
+            line="8449"
             column="44"/>
     </issue>
 
@@ -4859,7 +4859,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8440"
+            line="8449"
             column="44"/>
     </issue>
 
@@ -4870,7 +4870,7 @@
         errorLine2="                                                                      ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8440"
+            line="8449"
             column="71"/>
     </issue>
 
@@ -4881,7 +4881,7 @@
         errorLine2="                                                                      ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8440"
+            line="8449"
             column="71"/>
     </issue>
 
@@ -4892,7 +4892,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8455"
+            line="8464"
             column="39"/>
     </issue>
 
@@ -4903,7 +4903,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8455"
+            line="8464"
             column="39"/>
     </issue>
 
@@ -4914,7 +4914,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8489"
+            line="8498"
             column="34"/>
     </issue>
 
@@ -4925,7 +4925,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8489"
+            line="8498"
             column="34"/>
     </issue>
 
@@ -4936,7 +4936,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8508"
+            line="8517"
             column="41"/>
     </issue>
 
@@ -4947,7 +4947,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8508"
+            line="8517"
             column="41"/>
     </issue>
 
@@ -4958,7 +4958,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8526"
+            line="8535"
             column="41"/>
     </issue>
 
@@ -4969,7 +4969,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8526"
+            line="8535"
             column="41"/>
     </issue>
 
@@ -4980,7 +4980,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8537"
+            line="8546"
             column="29"/>
     </issue>
 
@@ -4991,7 +4991,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8537"
+            line="8546"
             column="29"/>
     </issue>
 
@@ -5002,7 +5002,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8549"
+            line="8558"
             column="29"/>
     </issue>
 
@@ -5013,7 +5013,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8549"
+            line="8558"
             column="29"/>
     </issue>
 
@@ -5024,7 +5024,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8615"
+            line="8624"
             column="32"/>
     </issue>
 
@@ -5035,7 +5035,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8615"
+            line="8624"
             column="32"/>
     </issue>
 
@@ -5046,7 +5046,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8794"
+            line="8803"
             column="64"/>
     </issue>
 
@@ -5057,7 +5057,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8794"
+            line="8803"
             column="64"/>
     </issue>
 
@@ -5068,7 +5068,7 @@
         errorLine2="                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="10292"
+            line="10301"
             column="44"/>
     </issue>
 
@@ -5079,7 +5079,7 @@
         errorLine2="                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="10292"
+            line="10301"
             column="44"/>
     </issue>
 
@@ -5090,7 +5090,7 @@
         errorLine2="                      ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="10623"
+            line="10632"
             column="23"/>
     </issue>
 
@@ -5101,7 +5101,7 @@
         errorLine2="                      ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="10623"
+            line="10632"
             column="23"/>
     </issue>
 
@@ -5112,7 +5112,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11559"
+            line="11568"
             column="31"/>
     </issue>
 
@@ -5123,7 +5123,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11559"
+            line="11568"
             column="31"/>
     </issue>
 
@@ -5134,7 +5134,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11566"
+            line="11575"
             column="31"/>
     </issue>
 
@@ -5145,7 +5145,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11566"
+            line="11575"
             column="31"/>
     </issue>
 
@@ -5156,7 +5156,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11573"
+            line="11582"
             column="31"/>
     </issue>
 
@@ -5167,7 +5167,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11573"
+            line="11582"
             column="31"/>
     </issue>
 
@@ -5178,7 +5178,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11579"
+            line="11588"
             column="60"/>
     </issue>
 
@@ -5189,7 +5189,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11579"
+            line="11588"
             column="60"/>
     </issue>
 
@@ -5200,7 +5200,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11579"
+            line="11588"
             column="76"/>
     </issue>
 
@@ -5211,7 +5211,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11579"
+            line="11588"
             column="76"/>
     </issue>
 
@@ -5222,7 +5222,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11584"
+            line="11593"
             column="60"/>
     </issue>
 
@@ -5233,7 +5233,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11584"
+            line="11593"
             column="60"/>
     </issue>
 
@@ -5244,7 +5244,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11584"
+            line="11593"
             column="76"/>
     </issue>
 
@@ -5255,7 +5255,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11584"
+            line="11593"
             column="76"/>
     </issue>
 
@@ -5266,7 +5266,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11615"
+            line="11624"
             column="29"/>
     </issue>
 
@@ -5277,7 +5277,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11615"
+            line="11624"
             column="29"/>
     </issue>
 
@@ -5288,7 +5288,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11615"
+            line="11624"
             column="40"/>
     </issue>
 
@@ -5299,7 +5299,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11615"
+            line="11624"
             column="40"/>
     </issue>
 
@@ -5310,7 +5310,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11623"
+            line="11632"
             column="29"/>
     </issue>
 
@@ -5321,7 +5321,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11623"
+            line="11632"
             column="29"/>
     </issue>
 
@@ -5332,7 +5332,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11627"
+            line="11636"
             column="29"/>
     </issue>
 
@@ -5343,7 +5343,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11627"
+            line="11636"
             column="29"/>
     </issue>
 
@@ -5354,7 +5354,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11631"
+            line="11640"
             column="29"/>
     </issue>
 
@@ -5365,7 +5365,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11631"
+            line="11640"
             column="29"/>
     </issue>
 
@@ -5376,7 +5376,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11948"
+            line="11957"
             column="37"/>
     </issue>
 
@@ -5387,7 +5387,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11948"
+            line="11957"
             column="37"/>
     </issue>
 
@@ -5398,7 +5398,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11962"
+            line="11971"
             column="16"/>
     </issue>
 
@@ -5409,7 +5409,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11962"
+            line="11971"
             column="16"/>
     </issue>
 
@@ -5420,7 +5420,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11975"
+            line="11984"
             column="48"/>
     </issue>
 
@@ -5431,7 +5431,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11975"
+            line="11984"
             column="48"/>
     </issue>
 
@@ -5442,7 +5442,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12316"
+            line="12325"
             column="35"/>
     </issue>
 
@@ -5453,7 +5453,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12316"
+            line="12325"
             column="35"/>
     </issue>
 
@@ -5464,7 +5464,7 @@
         errorLine2="                   ~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12527"
+            line="12536"
             column="20"/>
     </issue>
 
@@ -5475,7 +5475,7 @@
         errorLine2="                   ~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12527"
+            line="12536"
             column="20"/>
     </issue>
 
@@ -5486,7 +5486,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12542"
+            line="12551"
             column="41"/>
     </issue>
 
@@ -5497,7 +5497,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12542"
+            line="12551"
             column="41"/>
     </issue>
 
@@ -5508,7 +5508,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="51"
+            line="59"
             column="47"/>
     </issue>
 
@@ -5519,7 +5519,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="51"
+            line="59"
             column="47"/>
     </issue>
 
@@ -5530,7 +5530,7 @@
         errorLine2="                                                                     ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="51"
+            line="59"
             column="70"/>
     </issue>
 
@@ -5541,7 +5541,7 @@
         errorLine2="                                                                     ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="51"
+            line="59"
             column="70"/>
     </issue>
 
@@ -5552,7 +5552,7 @@
         errorLine2="                                                  ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="63"
+            line="71"
             column="51"/>
     </issue>
 
@@ -5563,7 +5563,7 @@
         errorLine2="                                                  ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="63"
+            line="71"
             column="51"/>
     </issue>
 
@@ -5574,7 +5574,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="63"
+            line="71"
             column="62"/>
     </issue>
 
@@ -5585,7 +5585,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="63"
+            line="71"
             column="62"/>
     </issue>
 
@@ -5596,7 +5596,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="71"
+            line="79"
             column="48"/>
     </issue>
 
@@ -5607,7 +5607,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="71"
+            line="79"
             column="48"/>
     </issue>
 
@@ -5618,7 +5618,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="71"
+            line="79"
             column="59"/>
     </issue>
 
@@ -5629,7 +5629,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="71"
+            line="79"
             column="59"/>
     </issue>
 
@@ -5640,7 +5640,7 @@
         errorLine2="                                                      ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="131"
+            line="142"
             column="55"/>
     </issue>
 
@@ -5651,7 +5651,7 @@
         errorLine2="                                                      ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="131"
+            line="142"
             column="55"/>
     </issue>
 
@@ -5662,7 +5662,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="131"
+            line="142"
             column="66"/>
     </issue>
 
@@ -5673,7 +5673,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="131"
+            line="142"
             column="66"/>
     </issue>
 
@@ -5684,7 +5684,7 @@
         errorLine2="                                                  ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="148"
+            line="159"
             column="51"/>
     </issue>
 
@@ -5695,7 +5695,7 @@
         errorLine2="                                                  ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="148"
+            line="159"
             column="51"/>
     </issue>
 
@@ -5706,7 +5706,7 @@
         errorLine2="                                                                         ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="148"
+            line="159"
             column="74"/>
     </issue>
 
@@ -5717,7 +5717,7 @@
         errorLine2="                                                                         ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="148"
+            line="159"
             column="74"/>
     </issue>
 
diff --git a/remotecallback/lint-baseline.xml b/remotecallback/lint-baseline.xml
index 6f3e7d9..428ec4d 100644
--- a/remotecallback/lint-baseline.xml
+++ b/remotecallback/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
diff --git a/room/common/lint-baseline.xml b/room/common/lint-baseline.xml
index 345e35f0..b780e79 100644
--- a/room/common/lint-baseline.xml
+++ b/room/common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/room/guava/lint-baseline.xml b/room/guava/lint-baseline.xml
index 2c55908..119356b 100644
--- a/room/guava/lint-baseline.xml
+++ b/room/guava/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
@@ -26,11 +26,11 @@
     <issue
         id="LambdaLast"
         message="Functional interface parameters (such as parameter 3, &quot;callable&quot;, in androidx.room.guava.GuavaRoom.createListenableFuture) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            final boolean releaseQuery) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            final @Nullable CancellationSignal cancellationSignal) {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="89"
+            line="106"
             column="13"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="84"
+            line="85"
             column="23"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="85"
+            line="86"
             column="19"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="87"
+            line="88"
             column="19"/>
     </issue>
 
@@ -151,73 +151,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="88"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static &lt;T> ListenableFuture&lt;T> createListenableFuture("
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="129"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            final RoomDatabase roomDatabase,"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="130"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            final Callable&lt;T> callable) {"
-        errorLine2="                  ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="131"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static &lt;T> ListenableFuture&lt;T> createListenableFuture("
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="139"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            final RoomDatabase roomDatabase,"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="140"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            final Callable&lt;T> callable) {"
-        errorLine2="                  ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="142"
+            line="89"
             column="19"/>
     </issue>
 
diff --git a/room/migration/lint-baseline.xml b/room/migration/lint-baseline.xml
index 64de87e..ed337cf 100644
--- a/room/migration/lint-baseline.xml
+++ b/room/migration/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/room/runtime/lint-baseline.xml b/room/runtime/lint-baseline.xml
index 46411f5..4cde10b 100644
--- a/room/runtime/lint-baseline.xml
+++ b/room/runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
diff --git a/room/rxjava2/lint-baseline.xml b/room/rxjava2/lint-baseline.xml
index e348714..65afbce 100644
--- a/room/rxjava2/lint-baseline.xml
+++ b/room/rxjava2/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -8,7 +8,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src/main/java/androidx/room/EmptyResultSetException.java"
-            line="28"
+            line="33"
             column="36"/>
     </issue>
 
diff --git a/room/testing/lint-baseline.xml b/room/testing/lint-baseline.xml
index fadc69d..b987289 100644
--- a/room/testing/lint-baseline.xml
+++ b/room/testing/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -8,7 +8,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="100"
+            line="102"
             column="32"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                                                ~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="100"
+            line="102"
             column="65"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="112"
+            line="114"
             column="32"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                                                                ~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="112"
+            line="114"
             column="65"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="113"
+            line="115"
             column="13"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="123"
+            line="125"
             column="29"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="140"
+            line="142"
             column="12"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="140"
+            line="142"
             column="49"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="201"
+            line="203"
             column="12"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="201"
+            line="203"
             column="59"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="202"
+            line="204"
             column="44"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="250"
+            line="252"
             column="29"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="277"
+            line="279"
             column="35"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="294"
+            line="296"
             column="35"/>
     </issue>
 
diff --git a/sharetarget/lint-baseline.xml b/sharetarget/lint-baseline.xml
index cb1fcbe..d7c16da 100644
--- a/sharetarget/lint-baseline.xml
+++ b/sharetarget/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/slices/builders/lint-baseline.xml b/slices/builders/lint-baseline.xml
index 6e080c4..90a8e34 100644
--- a/slices/builders/lint-baseline.xml
+++ b/slices/builders/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -184,7 +184,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="147"
+            line="148"
             column="30"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="                          ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="254"
+            line="255"
             column="27"/>
     </issue>
 
@@ -1020,7 +1020,7 @@
         errorLine2="                                    ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="498"
+            line="499"
             column="37"/>
     </issue>
 
@@ -1031,7 +1031,7 @@
         errorLine2="                                   ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="567"
+            line="568"
             column="36"/>
     </issue>
 
@@ -1042,7 +1042,7 @@
         errorLine2="                          ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="649"
+            line="650"
             column="27"/>
     </issue>
 
@@ -1053,7 +1053,7 @@
         errorLine2="                          ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="719"
+            line="720"
             column="27"/>
     </issue>
 
diff --git a/slices/core/lint-baseline.xml b/slices/core/lint-baseline.xml
index 82357fb..8e4a772 100644
--- a/slices/core/lint-baseline.xml
+++ b/slices/core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
@@ -1317,7 +1317,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="267"
+            line="268"
             column="12"/>
     </issue>
 
@@ -1328,7 +1328,7 @@
         errorLine2="           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="308"
+            line="310"
             column="12"/>
     </issue>
 
@@ -1339,7 +1339,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="323"
+            line="326"
             column="12"/>
     </issue>
 
@@ -1350,7 +1350,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="342"
+            line="345"
             column="45"/>
     </issue>
 
@@ -1361,7 +1361,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="350"
+            line="353"
             column="22"/>
     </issue>
 
@@ -1372,7 +1372,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="362"
+            line="365"
             column="12"/>
     </issue>
 
@@ -1383,7 +1383,7 @@
         errorLine2="                                             ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="375"
+            line="378"
             column="46"/>
     </issue>
 
@@ -1394,7 +1394,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="389"
+            line="392"
             column="49"/>
     </issue>
 
@@ -1405,7 +1405,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="452"
+            line="456"
             column="19"/>
     </issue>
 
@@ -1416,7 +1416,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="452"
+            line="456"
             column="39"/>
     </issue>
 
@@ -1427,7 +1427,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="485"
+            line="490"
             column="12"/>
     </issue>
 
@@ -1438,7 +1438,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="485"
+            line="490"
             column="28"/>
     </issue>
 
@@ -1449,7 +1449,7 @@
         errorLine2="                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="700"
+            line="705"
             column="23"/>
     </issue>
 
@@ -1460,7 +1460,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="700"
+            line="705"
             column="39"/>
     </issue>
 
@@ -1471,7 +1471,7 @@
         errorLine2="                                                       ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItem.java"
-            line="700"
+            line="705"
             column="56"/>
     </issue>
 
@@ -1504,7 +1504,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="84"
+            line="85"
             column="28"/>
     </issue>
 
@@ -1515,7 +1515,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="84"
+            line="85"
             column="43"/>
     </issue>
 
@@ -1526,7 +1526,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="120"
+            line="121"
             column="12"/>
     </issue>
 
@@ -1537,7 +1537,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="120"
+            line="121"
             column="26"/>
     </issue>
 
@@ -1548,7 +1548,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="152"
+            line="153"
             column="21"/>
     </issue>
 
@@ -1559,7 +1559,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="152"
+            line="153"
             column="45"/>
     </issue>
 
@@ -1570,7 +1570,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="165"
+            line="166"
             column="16"/>
     </issue>
 
@@ -1581,7 +1581,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/SliceItemHolder.java"
-            line="175"
+            line="176"
             column="29"/>
     </issue>
 
@@ -1621,946 +1621,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Object getWrapper() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="193"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected CompatPermissionManager onCreatePermissionManager("
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="218"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            String[] autoGrantPermissions) {"
-        errorLine2="            ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="219"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public final String getType(Uri uri) {"
-        errorLine2="                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="225"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public final String getType(Uri uri) {"
-        errorLine2="                                ~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="225"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="232"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="232"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="232"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="232"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Slice createPermissionSlice(Uri sliceUri, String callingPackage) {"
-        errorLine2="           ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="261"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Slice createPermissionSlice(Uri sliceUri, String callingPackage) {"
-        errorLine2="                                       ~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="261"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Slice createPermissionSlice(Uri sliceUri, String callingPackage) {"
-        errorLine2="                                                     ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="261"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public abstract Slice onBindSlice(Uri sliceUri);"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="340"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public abstract Slice onBindSlice(Uri sliceUri);"
-        errorLine2="                                      ~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="340"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onSlicePinned(Uri sliceUri) {}"
-        errorLine2="                              ~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="361"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onSliceUnpinned(Uri sliceUri) {}"
-        errorLine2="                                ~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="372"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void handleSlicePinned(Uri sliceUri) {"
-        errorLine2="                                  ~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="379"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void handleSliceUnpinned(Uri sliceUri) {"
-        errorLine2="                                    ~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="391"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public @NonNull Uri onMapIntentToUri(Intent intent) {"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="407"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Collection&lt;Uri> onGetSliceDescendants(Uri uri) {"
-        errorLine2="           ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="423"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Collection&lt;Uri> onGetSliceDescendants(Uri uri) {"
-        errorLine2="                                                 ~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="423"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setSpecs(Set&lt;SliceSpec> specs) {"
-        errorLine2="                                ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="503"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Set&lt;SliceSpec> getCurrentSpecs() {"
-        errorLine2="                  ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="512"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setClock(Clock clock) {"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="521"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Clock getClock() {"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProvider.java"
-            line="530"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceProviderCompat(SliceProvider provider, CompatPermissionManager permissionManager,"
-        errorLine2="                               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="111"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceProviderCompat(SliceProvider provider, CompatPermissionManager permissionManager,"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="111"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Context context) {"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="112"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getCallingPackage() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="134"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="141"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="141"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="141"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="141"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Slice bindSlice(Context context, Uri uri,"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="312"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Slice bindSlice(Context context, Uri uri,"
-        errorLine2="                                  ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="312"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Slice bindSlice(Context context, Uri uri,"
-        errorLine2="                                                   ~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="312"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Set&lt;SliceSpec> supportedSpecs) {"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="313"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void addSpecs(Bundle extras, Set&lt;SliceSpec> supportedSpecs) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="336"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void addSpecs(Bundle extras, Set&lt;SliceSpec> supportedSpecs) {"
-        errorLine2="                                               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="336"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Set&lt;SliceSpec> getSpecs(Bundle extras) {"
-        errorLine2="                  ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="350"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Set&lt;SliceSpec> getSpecs(Bundle extras) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="350"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Slice bindSlice(Context context, Intent intent,"
-        errorLine2="                  ~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="365"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Slice bindSlice(Context context, Intent intent,"
-        errorLine2="                                  ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="365"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Slice bindSlice(Context context, Intent intent,"
-        errorLine2="                                                   ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="365"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Set&lt;SliceSpec> supportedSpecs) {"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="366"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void pinSlice(Context context, Uri uri,"
-        errorLine2="                                ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="456"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void pinSlice(Context context, Uri uri,"
-        errorLine2="                                                 ~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="456"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Set&lt;SliceSpec> supportedSpecs) {"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="457"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void unpinSlice(Context context, Uri uri,"
-        errorLine2="                                  ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="478"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void unpinSlice(Context context, Uri uri,"
-        errorLine2="                                                   ~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="478"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Set&lt;SliceSpec> supportedSpecs) {"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="479"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Set&lt;SliceSpec> getPinnedSpecs(Context context, Uri uri) {"
-        errorLine2="                  ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="502"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Set&lt;SliceSpec> getPinnedSpecs(Context context, Uri uri) {"
-        errorLine2="                                                ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="502"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Set&lt;SliceSpec> getPinnedSpecs(Context context, Uri uri) {"
-        errorLine2="                                                                 ~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="502"
-            column="66"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Uri mapIntentToUri(Context context, Intent intent) {"
-        errorLine2="                  ~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="526"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Uri mapIntentToUri(Context context, Intent intent) {"
-        errorLine2="                                     ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="526"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static Uri mapIntentToUri(Context context, Intent intent) {"
-        errorLine2="                                                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="526"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static @NonNull Collection&lt;Uri> getSliceDescendants(Context context, @NonNull Uri uri) {"
-        errorLine2="                                                               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="580"
-            column="64"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static int checkSlicePermission(Context context, String packageName, Uri uri, int pid,"
-        errorLine2="                                           ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="599"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static int checkSlicePermission(Context context, String packageName, Uri uri, int pid,"
-        errorLine2="                                                            ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="599"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static int checkSlicePermission(Context context, String packageName, Uri uri, int pid,"
-        errorLine2="                                                                                ~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="599"
-            column="81"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void grantSlicePermission(Context context, String packageName, String toPackage,"
-        errorLine2="                                            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="623"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void grantSlicePermission(Context context, String packageName, String toPackage,"
-        errorLine2="                                                             ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="623"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void grantSlicePermission(Context context, String packageName, String toPackage,"
-        errorLine2="                                                                                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="623"
-            column="82"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Uri uri) {"
-        errorLine2="            ~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="624"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void revokeSlicePermission(Context context, String packageName, String toPackage,"
-        errorLine2="                                             ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="642"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void revokeSlicePermission(Context context, String packageName, String toPackage,"
-        errorLine2="                                                              ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="642"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void revokeSlicePermission(Context context, String packageName, String toPackage,"
-        errorLine2="                                                                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="642"
-            column="83"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Uri uri) {"
-        errorLine2="            ~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="643"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static List&lt;Uri> getPinnedSlices(Context context) {"
-        errorLine2="                  ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="661"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static List&lt;Uri> getPinnedSlices(Context context) {"
-        errorLine2="                                            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/compat/SliceProviderCompat.java"
-            line="661"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void attachInfo(Context context, ProviderInfo info) {"
-        errorLine2="                           ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="52"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void attachInfo(Context context, ProviderInfo info) {"
-        errorLine2="                                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="52"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="58"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="58"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="58"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
-        errorLine2="                                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="58"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public T createRemoteCallback(Context context) {"
-        errorLine2="           ~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="67"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public T createRemoteCallback(Context context) {"
-        errorLine2="                                  ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="67"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
-        errorLine2="           ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="78"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
-        errorLine2="                                           ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="78"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
-        errorLine2="                                                         ~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="78"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
-        errorLine2="                                                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="78"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Bundle args, String method) {"
-        errorLine2="            ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="79"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Bundle args, String method) {"
-        errorLine2="                         ~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/SliceProviderWithCallbacks.java"
-            line="79"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="        public SliceProviderWrapper(androidx.slice.SliceProvider provider,"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="67"
+            line="64"
             column="37"/>
     </issue>
 
@@ -2571,7 +1636,7 @@
         errorLine2="                ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="68"
+            line="65"
             column="17"/>
     </issue>
 
@@ -2582,7 +1647,7 @@
         errorLine2="                               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="76"
+            line="73"
             column="32"/>
     </issue>
 
@@ -2593,7 +1658,7 @@
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="76"
+            line="73"
             column="49"/>
     </issue>
 
@@ -2604,7 +1669,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="88"
+            line="85"
             column="16"/>
     </issue>
 
@@ -2615,7 +1680,7 @@
         errorLine2="                                                       ~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="88"
+            line="85"
             column="56"/>
     </issue>
 
@@ -2626,7 +1691,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="101"
+            line="98"
             column="16"/>
     </issue>
 
@@ -2637,7 +1702,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="101"
+            line="98"
             column="28"/>
     </issue>
 
@@ -2648,7 +1713,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="101"
+            line="98"
             column="43"/>
     </issue>
 
@@ -2659,7 +1724,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="101"
+            line="98"
             column="55"/>
     </issue>
 
@@ -2670,7 +1735,7 @@
         errorLine2="               ~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="144"
+            line="139"
             column="16"/>
     </issue>
 
@@ -2681,7 +1746,7 @@
         errorLine2="                                 ~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="144"
+            line="139"
             column="34"/>
     </issue>
 
@@ -2692,7 +1757,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="144"
+            line="139"
             column="48"/>
     </issue>
 
@@ -2703,7 +1768,7 @@
         errorLine2="                                  ~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="157"
+            line="152"
             column="35"/>
     </issue>
 
@@ -2714,7 +1779,7 @@
         errorLine2="                                    ~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="163"
+            line="158"
             column="37"/>
     </issue>
 
@@ -2725,7 +1790,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="169"
+            line="164"
             column="16"/>
     </issue>
 
@@ -2736,7 +1801,7 @@
         errorLine2="                                                     ~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="169"
+            line="164"
             column="54"/>
     </issue>
 
@@ -2747,7 +1812,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java"
-            line="177"
+            line="172"
             column="46"/>
     </issue>
 
diff --git a/slices/test/lint-baseline.xml b/slices/test/lint-baseline.xml
index 9ef855f..77af7a8 100644
--- a/slices/test/lint-baseline.xml
+++ b/slices/test/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="RestrictedApi"
diff --git a/slices/view/lint-baseline.xml b/slices/view/lint-baseline.xml
index 2fc453a..90263aa 100644
--- a/slices/view/lint-baseline.xml
+++ b/slices/view/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -151,7 +151,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="490"
+            line="491"
             column="25"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                           ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="511"
+            line="512"
             column="28"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="511"
+            line="512"
             column="39"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="                    ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowStyle.java"
-            line="42"
+            line="45"
             column="21"/>
     </issue>
 
@@ -767,7 +767,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="286"
+            line="295"
             column="33"/>
     </issue>
 
@@ -778,7 +778,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="380"
+            line="389"
             column="30"/>
     </issue>
 
@@ -789,7 +789,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="381"
+            line="390"
             column="27"/>
     </issue>
 
@@ -800,7 +800,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="896"
+            line="906"
             column="35"/>
     </issue>
 
@@ -811,7 +811,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="908"
+            line="918"
             column="25"/>
     </issue>
 
@@ -822,7 +822,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="947"
+            line="957"
             column="32"/>
     </issue>
 
@@ -833,7 +833,7 @@
         errorLine2="                                                      ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="947"
+            line="957"
             column="55"/>
     </issue>
 
@@ -844,7 +844,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="982"
+            line="992"
             column="35"/>
     </issue>
 
@@ -1438,7 +1438,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceLiveData.java"
-            line="110"
+            line="128"
             column="41"/>
     </issue>
 
@@ -1449,7 +1449,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceLiveData.java"
-            line="119"
+            line="137"
             column="41"/>
     </issue>
 
@@ -1460,7 +1460,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceLiveData.java"
-            line="130"
+            line="148"
             column="13"/>
     </issue>
 
@@ -1471,7 +1471,7 @@
         errorLine2="                                                                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceLiveData.java"
-            line="130"
+            line="148"
             column="67"/>
     </issue>
 
diff --git a/slidingpanelayout/lint-baseline.xml b/slidingpanelayout/lint-baseline.xml
index f4e00fe..e0ccd15 100644
--- a/slidingpanelayout/lint-baseline.xml
+++ b/slidingpanelayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/sqlite/sqlite-framework/lint-baseline.xml b/sqlite/sqlite-framework/lint-baseline.xml
index 95cca31..63ed963 100644
--- a/sqlite/sqlite-framework/lint-baseline.xml
+++ b/sqlite/sqlite-framework/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta05" client="gradle" variant="all" version="3.5.0-beta05">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
 </issues>
diff --git a/sqlite/sqlite/lint-baseline.xml b/sqlite/sqlite/lint-baseline.xml
index 06b60f6..6aa0487 100644
--- a/sqlite/sqlite/lint-baseline.xml
+++ b/sqlite/sqlite/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta05" client="gradle" variant="all" version="3.5.0-beta05">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -393,7 +393,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java"
-            line="82"
+            line="83"
             column="5"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java"
-            line="102"
+            line="103"
             column="5"/>
     </issue>
 
diff --git a/swiperefreshlayout/lint-baseline.xml b/swiperefreshlayout/lint-baseline.xml
index b3e06ae..16169a0 100644
--- a/swiperefreshlayout/lint-baseline.xml
+++ b/swiperefreshlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -45,7 +45,7 @@
         errorLine2="              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="278"
+            line="280"
             column="15"/>
     </issue>
 
@@ -56,7 +56,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="284"
+            line="286"
             column="43"/>
     </issue>
 
@@ -67,7 +67,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="607"
+            line="608"
             column="42"/>
     </issue>
 
@@ -78,7 +78,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="618"
+            line="619"
             column="51"/>
     </issue>
 
@@ -89,7 +89,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="634"
+            line="635"
             column="48"/>
     </issue>
 
@@ -100,7 +100,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="754"
+            line="755"
             column="42"/>
     </issue>
 
@@ -111,7 +111,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="910"
+            line="911"
             column="40"/>
     </issue>
 
@@ -122,7 +122,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="910"
+            line="911"
             column="52"/>
     </issue>
 
@@ -133,7 +133,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="919"
+            line="920"
             column="40"/>
     </issue>
 
@@ -144,7 +144,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="919"
+            line="920"
             column="52"/>
     </issue>
 
@@ -155,7 +155,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="928"
+            line="929"
             column="36"/>
     </issue>
 
@@ -166,7 +166,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="937"
+            line="938"
             column="32"/>
     </issue>
 
@@ -177,7 +177,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="944"
+            line="945"
             column="35"/>
     </issue>
 
@@ -188,7 +188,7 @@
         errorLine2="                                                               ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="944"
+            line="945"
             column="64"/>
     </issue>
 
@@ -199,7 +199,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="955"
+            line="956"
             column="40"/>
     </issue>
 
@@ -210,7 +210,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="955"
+            line="956"
             column="52"/>
     </issue>
 
@@ -221,7 +221,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="961"
+            line="962"
             column="40"/>
     </issue>
 
@@ -232,7 +232,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="961"
+            line="962"
             column="52"/>
     </issue>
 
@@ -243,7 +243,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="971"
+            line="972"
             column="35"/>
     </issue>
 
@@ -254,7 +254,7 @@
         errorLine2="                                                               ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="971"
+            line="972"
             column="64"/>
     </issue>
 
@@ -265,7 +265,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1008"
+            line="1009"
             column="36"/>
     </issue>
 
@@ -276,7 +276,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1022"
+            line="1023"
             column="38"/>
     </issue>
 
@@ -287,7 +287,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1029"
+            line="1030"
             column="37"/>
     </issue>
 
@@ -298,7 +298,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1035"
+            line="1036"
             column="34"/>
     </issue>
 
@@ -309,7 +309,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1073"
+            line="1074"
             column="31"/>
     </issue>
 
@@ -320,7 +320,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1079"
+            line="1080"
             column="60"/>
     </issue>
 
@@ -331,7 +331,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1079"
+            line="1080"
             column="76"/>
     </issue>
 
@@ -342,7 +342,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1114"
+            line="1115"
             column="31"/>
     </issue>
 
@@ -353,7 +353,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1120"
+            line="1121"
             column="60"/>
     </issue>
 
@@ -364,7 +364,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1120"
+            line="1121"
             column="76"/>
     </issue>
 
@@ -375,7 +375,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1225"
+            line="1226"
             column="33"/>
     </issue>
 
diff --git a/testutils/testutils-espresso/lint-baseline.xml b/testutils/testutils-espresso/lint-baseline.xml
index 6382932..04e66cd 100644
--- a/testutils/testutils-espresso/lint-baseline.xml
+++ b/testutils/testutils-espresso/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/testutils/testutils-runtime/lint-baseline.xml b/testutils/testutils-runtime/lint-baseline.xml
index a548f21..d3cb908 100644
--- a/testutils/testutils-runtime/lint-baseline.xml
+++ b/testutils/testutils-runtime/lint-baseline.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
         message="Functional interface parameters (such as parameter 1, &quot;owner&quot;, in androidx.testutils.LifecycleOwnerUtils.waitUntilState) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            final Lifecycle.State state) throws Throwable {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            final @NonNull Lifecycle.State state) throws Throwable {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/testutils/LifecycleOwnerUtils.java"
             line="66"
@@ -15,8 +15,8 @@
     <issue
         id="LambdaLast"
         message="Functional interface parameters (such as parameter 1, &quot;owner&quot;, in androidx.testutils.LifecycleOwnerUtils.waitUntilState) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        errorLine1="            final Lifecycle.State state) throws Throwable {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            final @NonNull Lifecycle.State state) throws Throwable {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/testutils/LifecycleOwnerUtils.java"
             line="66"
diff --git a/textclassifier/lint-baseline.xml b/textclassifier/lint-baseline.xml
index 6e71dfb..651db48 100644
--- a/textclassifier/lint-baseline.xml
+++ b/textclassifier/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -162,7 +162,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="90"
+            line="89"
             column="19"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="90"
+            line="89"
             column="49"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/textclassifier/widget/ToolbarController.java"
-            line="131"
+            line="130"
             column="22"/>
     </issue>
 
diff --git a/transition/transition/lint-baseline.xml b/transition/transition/lint-baseline.xml
index 991ae81..daf886e 100644
--- a/transition/transition/lint-baseline.xml
+++ b/transition/transition/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -2736,7 +2736,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="277"
+            line="274"
             column="23"/>
     </issue>
 
@@ -2747,7 +2747,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="277"
+            line="274"
             column="23"/>
     </issue>
 
@@ -2758,7 +2758,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="277"
+            line="274"
             column="40"/>
     </issue>
 
@@ -2769,7 +2769,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="277"
+            line="274"
             column="40"/>
     </issue>
 
@@ -2780,7 +2780,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="509"
+            line="506"
             column="43"/>
     </issue>
 
@@ -2791,7 +2791,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="509"
+            line="506"
             column="43"/>
     </issue>
 
@@ -2802,7 +2802,7 @@
         errorLine2="                                   ~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="704"
+            line="701"
             column="36"/>
     </issue>
 
@@ -2813,7 +2813,7 @@
         errorLine2="                                   ~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="704"
+            line="701"
             column="36"/>
     </issue>
 
@@ -2824,7 +2824,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="704"
+            line="701"
             column="57"/>
     </issue>
 
@@ -2835,7 +2835,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="704"
+            line="701"
             column="57"/>
     </issue>
 
@@ -2846,7 +2846,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="705"
+            line="702"
             column="13"/>
     </issue>
 
@@ -2857,7 +2857,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="705"
+            line="702"
             column="13"/>
     </issue>
 
@@ -2868,7 +2868,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="705"
+            line="702"
             column="45"/>
     </issue>
 
@@ -2879,7 +2879,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="705"
+            line="702"
             column="45"/>
     </issue>
 
@@ -2890,7 +2890,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="706"
+            line="703"
             column="13"/>
     </issue>
 
@@ -2901,7 +2901,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="706"
+            line="703"
             column="13"/>
     </issue>
 
@@ -2912,7 +2912,7 @@
         errorLine2="                      ~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="1718"
+            line="1715"
             column="23"/>
     </issue>
 
@@ -2923,7 +2923,7 @@
         errorLine2="                      ~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="1718"
+            line="1715"
             column="23"/>
     </issue>
 
@@ -2934,7 +2934,7 @@
         errorLine2="                       ~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="1750"
+            line="1747"
             column="24"/>
     </issue>
 
@@ -2945,7 +2945,7 @@
         errorLine2="                       ~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="1750"
+            line="1747"
             column="24"/>
     </issue>
 
@@ -2956,7 +2956,7 @@
         errorLine2="                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="1897"
+            line="1894"
             column="28"/>
     </issue>
 
@@ -2967,7 +2967,7 @@
         errorLine2="                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="1897"
+            line="1894"
             column="28"/>
     </issue>
 
@@ -2978,7 +2978,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="2222"
+            line="2214"
             column="12"/>
     </issue>
 
@@ -2989,7 +2989,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="2222"
+            line="2214"
             column="12"/>
     </issue>
 
@@ -3000,7 +3000,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="2445"
+            line="2437"
             column="25"/>
     </issue>
 
@@ -3011,7 +3011,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/transition/Transition.java"
-            line="2445"
+            line="2437"
             column="25"/>
     </issue>
 
@@ -3132,7 +3132,7 @@
         errorLine2="                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/TransitionManager.java"
-            line="429"
+            line="428"
             column="45"/>
     </issue>
 
@@ -3143,7 +3143,7 @@
         errorLine2="                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/TransitionManager.java"
-            line="429"
+            line="428"
             column="45"/>
     </issue>
 
@@ -3506,7 +3506,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/TransitionSet.java"
-            line="619"
+            line="609"
             column="32"/>
     </issue>
 
@@ -3517,7 +3517,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/TransitionSet.java"
-            line="619"
+            line="609"
             column="32"/>
     </issue>
 
@@ -3528,7 +3528,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/TransitionSet.java"
-            line="629"
+            line="619"
             column="38"/>
     </issue>
 
@@ -3539,7 +3539,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/TransitionSet.java"
-            line="629"
+            line="619"
             column="38"/>
     </issue>
 
@@ -3550,7 +3550,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/TransitionSet.java"
-            line="648"
+            line="638"
             column="12"/>
     </issue>
 
@@ -3561,7 +3561,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/transition/TransitionSet.java"
-            line="648"
+            line="638"
             column="12"/>
     </issue>
 
diff --git a/tv-provider/lint-baseline.xml b/tv-provider/lint-baseline.xml
index f4c0364..2e0be29 100644
--- a/tv-provider/lint-baseline.xml
+++ b/tv-provider/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
diff --git a/ui/ui-android-text/lint-baseline.xml b/ui/ui-android-text/lint-baseline.xml
index b12440b..d916824 100644
--- a/ui/ui-android-text/lint-baseline.xml
+++ b/ui/ui-android-text/lint-baseline.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.4.0" client="gradle" variant="debug" version="3.4.0">
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void updateDrawState(TextPaint textPaint) {"
-        errorLine2="                                ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/text/style/BaselineShiftSpan.java"
-            line="49"
-            column="33"/>
-    </issue>
+<issues format="5" by="lint 3.5.0-beta05" client="gradle" variant="debug" version="3.5.0-beta05">
 
     <issue
         id="UnknownNullness"
@@ -48,17 +37,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Object clone() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/androidx/text/CharSequenceCharacterIterator.java"
-            line="186"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void updateDrawState(TextPaint textPaint) {"
         errorLine2="                                ~~~~~~~~~">
         <location
@@ -147,17 +125,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void updateDrawState(TextPaint tp) {"
-        errorLine2="                                ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/text/style/ShadowSpan.java"
-            line="46"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void updateDrawState(TextPaint textPaint) {"
         errorLine2="                                ~~~~~~~~~">
         <location
@@ -206,7 +173,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src/main/java/androidx/text/selection/WordBoundary.java"
-            line="53"
+            line="55"
             column="25"/>
     </issue>
 
@@ -217,7 +184,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/text/selection/WordBoundary.java"
-            line="53"
+            line="55"
             column="40"/>
     </issue>
 
@@ -228,30 +195,8 @@
         errorLine2="                                                                                ~~~~~~">
         <location
             file="src/main/java/androidx/text/selection/WordIterator.java"
-            line="56"
+            line="58"
             column="81"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void updateDrawState(TextPaint textPaint) {"
-        errorLine2="                                ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/text/style/WordSpacingSpan.java"
-            line="85"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void updateMeasureState(TextPaint textPaint) {"
-        errorLine2="                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/text/style/WordSpacingSpan.java"
-            line="90"
-            column="36"/>
-    </issue>
-
 </issues>
diff --git a/versionedparcelable/lint-baseline.xml b/versionedparcelable/lint-baseline.xml
index 734b830..becca4282b 100644
--- a/versionedparcelable/lint-baseline.xml
+++ b/versionedparcelable/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
diff --git a/viewpager/lint-baseline.xml b/viewpager/lint-baseline.xml
index 160efd8..8984e07 100644
--- a/viewpager/lint-baseline.xml
+++ b/viewpager/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta04" client="gradle" variant="debug" version="3.5.0-beta04">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="LambdaLast"
@@ -19,7 +19,7 @@
         errorLine2="                                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"
-            line="174"
+            line="172"
             column="39"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"
-            line="226"
+            line="224"
             column="33"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"
-            line="263"
+            line="261"
             column="27"/>
     </issue>
 
diff --git a/viewpager2/lint-baseline.xml b/viewpager2/lint-baseline.xml
index 192d3d3..44ed37c 100644
--- a/viewpager2/lint-baseline.xml
+++ b/viewpager2/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="UnknownNullness"
@@ -96,7 +96,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="938"
+            line="948"
             column="51"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="938"
+            line="948"
             column="51"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="945"
+            line="955"
             column="59"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="945"
+            line="955"
             column="59"/>
     </issue>
 
diff --git a/wear/lint-baseline.xml b/wear/lint-baseline.xml
index 9356d03..e811347 100644
--- a/wear/lint-baseline.xml
+++ b/wear/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -101,7 +101,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="101"
+            line="100"
             column="9"/>
     </issue>
 
@@ -112,7 +112,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="117"
+            line="116"
             column="36"/>
     </issue>
 
@@ -123,7 +123,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="182"
+            line="181"
             column="26"/>
     </issue>
 
@@ -134,7 +134,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="195"
+            line="194"
             column="26"/>
     </issue>
 
@@ -145,7 +145,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="251"
+            line="250"
             column="40"/>
     </issue>
 
@@ -156,7 +156,7 @@
         errorLine2="                                                                              ~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="251"
+            line="250"
             column="79"/>
     </issue>
 
@@ -167,7 +167,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="266"
+            line="265"
             column="22"/>
     </issue>
 
@@ -178,7 +178,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="266"
+            line="265"
             column="37"/>
     </issue>
 
@@ -189,7 +189,7 @@
         errorLine2="                                                       ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="266"
+            line="265"
             column="56"/>
     </issue>
 
@@ -200,7 +200,7 @@
         errorLine2="                                                                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="266"
+            line="265"
             column="76"/>
     </issue>
 
@@ -636,83 +636,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ConfirmationOverlay setMessage(String message) {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/widget/ConfirmationOverlay.java"
-            line="145"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ConfirmationOverlay setMessage(String message) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/widget/ConfirmationOverlay.java"
-            line="145"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ConfirmationOverlay setType(@OverlayType int type) {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/widget/ConfirmationOverlay.java"
-            line="155"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ConfirmationOverlay setDuration(int millis) {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/widget/ConfirmationOverlay.java"
-            line="166"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ConfirmationOverlay setFinishedAnimationListener("
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/widget/ConfirmationOverlay.java"
-            line="177"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void showAbove(View view) {"
-        errorLine2="                          ~~~~">
-        <location
-            file="src/main/java/androidx/wear/widget/ConfirmationOverlay.java"
-            line="188"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void showOn(Activity activity) {"
-        errorLine2="                       ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/widget/ConfirmationOverlay.java"
-            line="204"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public CurvingLayoutCallback(Context context) {"
         errorLine2="                                 ~~~~~~~">
         <location
@@ -1058,7 +981,7 @@
         errorLine2="                               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/RoundedDrawable.java"
-            line="247"
+            line="248"
             column="32"/>
     </issue>
 
@@ -1377,7 +1300,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="251"
+            line="252"
             column="16"/>
     </issue>
 
@@ -1388,7 +1311,7 @@
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="251"
+            line="252"
             column="34"/>
     </issue>
 
@@ -1399,7 +1322,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="260"
+            line="261"
             column="16"/>
     </issue>
 
@@ -1410,7 +1333,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="265"
+            line="266"
             column="16"/>
     </issue>
 
@@ -1421,7 +1344,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="270"
+            line="271"
             column="16"/>
     </issue>
 
@@ -1432,7 +1355,7 @@
         errorLine2="                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="270"
+            line="271"
             column="33"/>
     </issue>
 
@@ -1443,7 +1366,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="279"
+            line="280"
             column="16"/>
     </issue>
 
@@ -1454,7 +1377,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="284"
+            line="285"
             column="16"/>
     </issue>
 
@@ -1465,7 +1388,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="289"
+            line="290"
             column="16"/>
     </issue>
 
@@ -1476,7 +1399,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="289"
+            line="290"
             column="52"/>
     </issue>
 
@@ -1487,7 +1410,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="305"
+            line="306"
             column="16"/>
     </issue>
 
@@ -1498,7 +1421,7 @@
         errorLine2="                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="305"
+            line="306"
             column="43"/>
     </issue>
 
@@ -1509,7 +1432,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="310"
+            line="311"
             column="16"/>
     </issue>
 
@@ -1520,7 +1443,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="315"
+            line="316"
             column="16"/>
     </issue>
 
@@ -1531,7 +1454,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="315"
+            line="316"
             column="35"/>
     </issue>
 
@@ -1542,7 +1465,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="320"
+            line="321"
             column="16"/>
     </issue>
 
@@ -1553,7 +1476,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="325"
+            line="326"
             column="16"/>
     </issue>
 
@@ -1564,7 +1487,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="330"
+            line="331"
             column="16"/>
     </issue>
 
@@ -1575,7 +1498,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="340"
+            line="341"
             column="16"/>
     </issue>
 
@@ -1586,7 +1509,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="350"
+            line="351"
             column="16"/>
     </issue>
 
@@ -1597,7 +1520,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="360"
+            line="361"
             column="16"/>
     </issue>
 
@@ -1608,7 +1531,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="370"
+            line="371"
             column="16"/>
     </issue>
 
@@ -1619,7 +1542,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="380"
+            line="381"
             column="16"/>
     </issue>
 
@@ -1630,7 +1553,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="395"
+            line="396"
             column="16"/>
     </issue>
 
@@ -1641,7 +1564,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="400"
+            line="401"
             column="16"/>
     </issue>
 
@@ -1652,7 +1575,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="410"
+            line="411"
             column="16"/>
     </issue>
 
@@ -1663,7 +1586,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="415"
+            line="416"
             column="16"/>
     </issue>
 
@@ -1674,7 +1597,7 @@
         errorLine2="                                      ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="415"
+            line="416"
             column="39"/>
     </issue>
 
@@ -1685,7 +1608,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="420"
+            line="421"
             column="16"/>
     </issue>
 
@@ -1696,7 +1619,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="425"
+            line="426"
             column="16"/>
     </issue>
 
@@ -1707,7 +1630,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="430"
+            line="431"
             column="16"/>
     </issue>
 
@@ -1718,7 +1641,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="430"
+            line="431"
             column="43"/>
     </issue>
 
@@ -1729,7 +1652,7 @@
         errorLine2="               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="435"
+            line="436"
             column="16"/>
     </issue>
 
@@ -1740,7 +1663,7 @@
         errorLine2="               ~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="455"
+            line="456"
             column="16"/>
     </issue>
 
@@ -1751,7 +1674,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerMenu.java"
-            line="455"
+            line="456"
             column="51"/>
     </issue>
 
@@ -1762,7 +1685,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="99"
+            line="98"
             column="37"/>
     </issue>
 
@@ -1773,7 +1696,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="103"
+            line="102"
             column="37"/>
     </issue>
 
@@ -1784,7 +1707,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="103"
+            line="102"
             column="54"/>
     </issue>
 
@@ -1795,7 +1718,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="107"
+            line="106"
             column="37"/>
     </issue>
 
@@ -1806,7 +1729,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="107"
+            line="106"
             column="54"/>
     </issue>
 
@@ -1817,7 +1740,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="112"
+            line="111"
             column="13"/>
     </issue>
 
@@ -1828,7 +1751,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="112"
+            line="111"
             column="30"/>
     </issue>
 
@@ -1839,7 +1762,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="215"
+            line="214"
             column="40"/>
     </issue>
 
@@ -1850,7 +1773,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="231"
+            line="230"
             column="44"/>
     </issue>
 
@@ -1861,7 +1784,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="313"
+            line="312"
             column="12"/>
     </issue>
 
diff --git a/webkit/lint-baseline.xml b/webkit/lint-baseline.xml
index 4670e40..cb6227a 100644
--- a/webkit/lint-baseline.xml
+++ b/webkit/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="NewApi"
diff --git a/work/workmanager-testing/lint-baseline.xml b/work/workmanager-testing/lint-baseline.xml
index 2065f74..3f3e277 100644
--- a/work/workmanager-testing/lint-baseline.xml
+++ b/work/workmanager-testing/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -8,7 +8,7 @@
         errorLine2="         ~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="104"
+            line="108"
             column="10"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="         ~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="104"
+            line="108"
             column="10"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="112"
+            line="116"
             column="10"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="112"
+            line="116"
             column="10"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                 ~~~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="120"
+            line="124"
             column="18"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                 ~~~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="120"
+            line="124"
             column="18"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="127"
+            line="131"
             column="9"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="127"
+            line="131"
             column="9"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="144"
+            line="148"
             column="19"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/testing/TestListenableWorkerBuilder.java"
-            line="144"
+            line="148"
             column="19"/>
     </issue>
 
diff --git a/work/workmanager/lint-baseline.xml b/work/workmanager/lint-baseline.xml
index 90d0016..ea160a9 100644
--- a/work/workmanager/lint-baseline.xml
+++ b/work/workmanager/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.6.0-alpha12" client="gradle" variant="debug" version="3.6.0-alpha12">
+<issues format="5" by="lint 3.6.0-beta01" client="gradle" variant="debug" version="3.6.0-beta01">
 
     <issue
         id="KotlinPropertyAccess"
@@ -143,28 +143,6 @@
 
     <issue
         id="KotlinPropertyAccess"
-        message="This method should be called `getNeedsReschedule` such that `needsReschedule` can be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
-        errorLine1="    public boolean needsReschedule() {"
-        errorLine2="                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/impl/utils/Preferences.java"
-            line="82"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="KotlinPropertyAccess"
-        message="This method should be called `getNeedsReschedule` such that `needsReschedule` can be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
-        errorLine1="    public boolean needsReschedule() {"
-        errorLine2="                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/impl/utils/Preferences.java"
-            line="82"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="KotlinPropertyAccess"
         message="The getter return type (`boolean`) and setter parameter type (`long`) getter and setter methods for property `periodic` should have exactly the same type to allow be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
         errorLine1="    public boolean isPeriodic() {"
         errorLine2="                   ~~~~~~~~~~">
@@ -662,7 +640,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="112"
+            line="113"
             column="19"/>
     </issue>
 
@@ -673,7 +651,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="112"
+            line="113"
             column="19"/>
     </issue>
 
@@ -684,7 +662,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="139"
+            line="140"
             column="19"/>
     </issue>
 
@@ -695,7 +673,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="139"
+            line="140"
             column="19"/>
     </issue>
 
@@ -706,7 +684,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="171"
+            line="172"
             column="19"/>
     </issue>
 
@@ -717,7 +695,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="171"
+            line="172"
             column="19"/>
     </issue>
 
@@ -728,7 +706,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="205"
+            line="206"
             column="19"/>
     </issue>
 
@@ -739,7 +717,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="205"
+            line="206"
             column="19"/>
     </issue>
 
@@ -1102,7 +1080,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="217"
+            line="220"
             column="31"/>
     </issue>
 
@@ -1113,7 +1091,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="217"
+            line="220"
             column="31"/>
     </issue>
 
@@ -1124,7 +1102,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="217"
+            line="220"
             column="48"/>
     </issue>
 
@@ -1135,35 +1113,13 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="217"
+            line="220"
             column="48"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public IdGenerator(Context context) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/impl/utils/IdGenerator.java"
-            line="50"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public IdGenerator(Context context) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/impl/utils/IdGenerator.java"
-            line="50"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public static InputMerger fromClassName(String className) {"
         errorLine2="                  ~~~~~~~~~~~">
         <location
@@ -2198,28 +2154,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public LiveData&lt;Long> getLastCancelAllTimeMillisLiveData() {"
-        errorLine2="           ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/impl/utils/Preferences.java"
-            line="66"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public LiveData&lt;Long> getLastCancelAllTimeMillisLiveData() {"
-        errorLine2="           ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/impl/utils/Preferences.java"
-            line="66"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public PruneWorkRunnable(WorkManagerImpl workManagerImpl) {"
         errorLine2="                             ~~~~~~~~~~~~~~~">
         <location
@@ -2664,7 +2598,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="73"
+            line="72"
             column="13"/>
     </issue>
 
@@ -2675,6 +2609,17 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
+            line="72"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="            WorkManagerImpl workManager,"
+        errorLine2="            ~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
             line="73"
             column="13"/>
     </issue>
@@ -2686,15 +2631,15 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="74"
+            line="73"
             column="13"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            WorkManagerImpl workManager,"
-        errorLine2="            ~~~~~~~~~~~~~~~">
+        errorLine1="            JobScheduler jobScheduler,"
+        errorLine2="            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
             line="74"
@@ -2708,15 +2653,15 @@
         errorLine2="            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="75"
+            line="74"
             column="13"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            JobScheduler jobScheduler,"
-        errorLine2="            ~~~~~~~~~~~~">
+        errorLine1="            SystemJobInfoConverter systemJobInfoConverter) {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
             line="75"
@@ -2730,18 +2675,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="76"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            SystemJobInfoConverter systemJobInfoConverter) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="76"
+            line="75"
             column="13"/>
     </issue>
 
@@ -2752,7 +2686,7 @@
         errorLine2="                                 ~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="176"
+            line="175"
             column="34"/>
     </issue>
 
@@ -2763,7 +2697,7 @@
         errorLine2="                                 ~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="176"
+            line="175"
             column="34"/>
     </issue>
 
@@ -4556,7 +4490,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/work/WorkerParameters.java"
-            line="197"
+            line="208"
             column="16"/>
     </issue>
 
@@ -4567,7 +4501,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/work/WorkerParameters.java"
-            line="197"
+            line="208"
             column="16"/>
     </issue>
 
@@ -4578,7 +4512,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/WorkerWrapper.java"
-            line="714"
+            line="688"
             column="16"/>
     </issue>
 
@@ -4589,7 +4523,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/WorkerWrapper.java"
-            line="714"
+            line="688"
             column="16"/>
     </issue>